COVESA · fcmonteiro · Oct 28, 2025 · Aug 25, 2025 · Aug 25, 2025 · Aug 25, 2025
diff --git a/Android.bp b/Android.bp
@@ -79,8 +79,8 @@ cc_library_shared {
 
     cflags: [
         "-DWITHOUT_SYSTEMD",
-        "-DVSOMEIP_VERSION=\"3.5.8\"",
-        "-DVSOMEIP_COMPAT_VERSION=\"3.5.8\"",
+        "-DVSOMEIP_VERSION=\"3.5.9\"",
+        "-DVSOMEIP_COMPAT_VERSION=\"3.5.9\"",
         "-DVSOMEIP_BASE_PATH=\"/vendor/run/someip/\"",
         "-DUSE_DLT",
     ],
@@ -93,7 +93,8 @@ cc_library_shared {
         "-Wl,-wrap,recvfrom",
         "-Wl,-wrap,recvmsg",
         "-Wl,-wrap,sendto",
-        "-Wl,-wrap,sendmsg"
+        "-Wl,-wrap,sendmsg",
+        "-Wl,-wrap,epoll_wait"
     ],
 
     rtti: true,

diff --git a/Android.mk b/Android.mk
@@ -101,7 +101,7 @@ LOCAL_CFLAGS :=  \
     -frtti \
     -fexceptions \
     -DWITHOUT_SYSTEMD \
-    -DVSOMEIP_VERSION=\"3.5.8\" \
+    -DVSOMEIP_VERSION=\"3.5.9\" \
     -DVSOMEIP_BASE_PATH=\"/vendor/run/someip/\" \
     -Wno-unused-parameter \
     -Wno-non-virtual-dtor \
@@ -126,6 +126,7 @@ LOCAL_LDFLAGS := \
     -Wl,-wrap,recvmsg \
     -Wl,-wrap,sendto \
     -Wl,-wrap,sendmsg \
+    -Wl,-wrap,epoll_wait \
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -159,7 +160,7 @@ LOCAL_CFLAGS := \
     -frtti \
     -fexceptions \
     -DWITHOUT_SYSTEMD \
-    -DVSOMEIP_VERSION=\"3.5.8\" \
+    -DVSOMEIP_VERSION=\"3.5.9\" \
     -DVSOMEIP_BASE_PATH=\"/vendor/run/someip/\" \
     -Wno-unused-parameter \
     -Wno-non-virtual-dtor \
@@ -206,8 +207,8 @@ LOCAL_CFLAGS :=  \
     -frtti \
     -fexceptions \
     -DWITHOUT_SYSTEMD \
-    -DVSOMEIP_VERSION=\"3.5.8\" \
-    -DVSOMEIP_COMPAT_VERSION=\"3.5.8\" \
+    -DVSOMEIP_VERSION=\"3.5.9\" \
+    -DVSOMEIP_COMPAT_VERSION=\"3.5.9\" \
     -DVSOMEIP_BASE_PATH=\"/vendor/run/someip/\" \
     -Wno-unused-parameter \
     -Wno-non-virtual-dtor \
@@ -229,5 +230,6 @@ LOCAL_CFLAGS :=  \
     -Wl,-wrap,recvmsg \
     -Wl,-wrap,sendto \
     -Wl,-wrap,sendmsg \
+    -Wl,-wrap,epoll_wait \
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,58 @@
 Changes
 =======
+v3.5.9
+- global
+  - Add vsomeip version to cmake log
+  - Add support for VSOMEIP_ABORT_ON_CRIT_SYSCALL_ERROR
+  - Remove use of strerror
+  - React on Bad File Descriptor (EOBADF) for epoll_wait
+  - Remove leftover configurations
+  - Improve logger performance, turn it almost lock-free
+  - Fix use of boost non-asio error codes
+  - Fix compile with GCC < 10 again
+  - Mark all DLT log messages as public
+
+- tests
+ - network tests
+    - Fix and/or document debounce_callback_test,
+      cyclic_event_tests, debounce_filter_test,
+      suspend_resume_test_initial, event_test,
+      offer_stop_offer_test, allow_reconnects,
+      subscribe_notify_test_one_event_two_eventgroups_tcp,
+      offer_test_local, debounce_frequency_test,
+      test_restart_client_in_loop, offer_test_service
+    - Create multicast group test
+
+  - unit tests
+    - Created udp_server_endpoint_impl unit tests
+    - Fix unit tests with boost 1.87+
+
+- endpoint
+  - Fix get_local_port, remove set_local_port
+  - Fix multicast leave, add repeat delay
+  - Ensure socket closure on dtor
+  - Remove duplicate shutdown closure of sockets
+  - Add SO_REUSEPORT option to mitigate Address already used issues
+
+  - local communication
+    - Fix race condition on accept_cbk
+    - Improve logs
+    - Fix client connect logic due to netlink removal
+
+  - external communication
+    - Fix race condition usei with on_message_received_unlocked
+    - Remove duplicate shutdown closure of sockets on tcp_client_endpoint_impl
+
+- routing
+ - Remove remote subscription on connection lost towards host
+
+  - routing manager client
+    - Remove sender start on init
+    - Fix client-side-logging crash
+
+- android
+  - Cleanup ifdef ANDROID
+
 v3.5.8
 - android
   - Possibility to build vsomeip with android NDK

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,10 +11,13 @@ set (VSOMEIP_COMPAT_NAME vsomeip)
 
 set (VSOMEIP_MAJOR_VERSION 3)
 set (VSOMEIP_MINOR_VERSION 5)
-set (VSOMEIP_PATCH_VERSION 8)
+set (VSOMEIP_PATCH_VERSION 9)
 set (VSOMEIP_HOTFIX_VERSION 0)
 
 set (VSOMEIP_VERSION ${VSOMEIP_MAJOR_VERSION}.${VSOMEIP_MINOR_VERSION}.${VSOMEIP_PATCH_VERSION})
+
+message (STATUS "  Building vSomeip-Lib v${VSOMEIP_VERSION}.${VSOMEIP_HOTFIX_VERSION}")
+
 set (PACKAGE_VERSION ${VSOMEIP_VERSION}) # Used in documentation/doxygen.in
 set (CMAKE_VERBOSE_MAKEFILE off)
 
@@ -140,7 +143,9 @@ if (NOT MSVC)
     find_program(VALGRIND "valgrind")
     if (VALGRIND)
         if (DEFINED VALGRIND_TYPE AND NOT VALGRIND_TYPE STREQUAL "")
-            set(TEST_ENTRYPOINT ${VALGRIND} --tool=${VALGRIND_TYPE} --trace-children=yes)
+            # The --fair-sched option controls the locking mechanism used by Valgrind to serialise thread execution.
+            # The locking mechanism controls the way the threads are scheduled, and different settings give different trade-offs between fairness and performance.
+            set(TEST_ENTRYPOINT ${VALGRIND} --tool=${VALGRIND_TYPE} --trace-children=yes --fair-sched=yes)
             add_definitions(-DBOOST_USE_VALGRIND)
         endif ()
 
@@ -334,7 +339,7 @@ else ()
     set_target_properties(${VSOMEIP_NAME} PROPERTIES LINK_FLAGS "-Wl,-wrap,socket -Wl,-wrap,accept -Wl,-wrap,open")
   else ()
     # add syscall wrappers to deal with CLOEXEC + react on BADFD
-    set_target_properties(${VSOMEIP_NAME} PROPERTIES LINK_FLAGS "-Wl,-wrap,socket -Wl,-wrap,accept -Wl,-wrap,open -Wl,-wrap,close -Wl,-wrap,recvfrom -Wl,-wrap,recvmsg -Wl,-wrap,sendto -Wl,-wrap,sendmsg")
+    set_target_properties(${VSOMEIP_NAME} PROPERTIES LINK_FLAGS "-Wl,-wrap,socket -Wl,-wrap,accept -Wl,-wrap,open -Wl,-wrap,close -Wl,-wrap,recvfrom -Wl,-wrap,recvmsg -Wl,-wrap,sendto -Wl,-wrap,sendmsg -Wl,-wrap,epoll_wait")
   endif ()
 endif ()
 target_include_directories(${VSOMEIP_NAME} INTERFACE

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -12,6 +12,10 @@
 			"generator": "Ninja",
 			"binaryDir": "/home/build",
 			"cacheVariables": {
+				"DISABLE_DLT": {
+				    "type": "BOOL",
+				    "value": "ON"
+				},
 				"CMAKE_CXX_FLAGS_INIT": {
 					"type": "STRING",
 					"value": "--coverage -Wno-error=tsan -fprofile-update=atomic"

diff --git a/documentation/network-tests.md b/documentation/network-tests.md
@@ -30,16 +30,7 @@ This page will guide you to accomplish that goal.
 
 ## Main steps
 
-1. Clone dlt-daemon to the same Project folder as vsomeip.
-
-    ```bash
-    git clone https://github.com/COVESA/dlt-daemon.git
-
-    $ ls
-    dlt-daemon    vsomeip
-    ```
-
-2. Set the sanitizer or valgrind type you'd like to use (use sanitizer LEAK if you don't know or care which one gets used)
+1. Set the sanitizer or valgrind type you'd like to use (use sanitizer LEAK if you don't know or care which one gets used)
 
     **Syntax sanitizers**
 
@@ -77,13 +68,13 @@ This page will guide you to accomplish that goal.
     export VALGRIND_TYPE=memcheck
     ```
 
-3. Create the containers (you must be inside the vsomeip repo to run this step). This will first build the Docker image used by both that contains everything needed to build and run the network-tests (CMake, GCC, Boost, etc.)
+2. Create the containers (you must be inside the vsomeip repo to run this step). This will first build the Docker image used by both that contains everything needed to build and run the network-tests (CMake, GCC, Boost, etc.)
 
     ```bash
     docker compose --project-directory zuul/network-tests build
     ```
 
-4. Start the containers (same as above, you must be inside the repo directory). This will build vsomeip-lib and then run the network-tests
+3. Start the containers (same as above, you must be inside the repo directory). This will build vsomeip-lib and then run the network-tests
 
     ```bash
     docker compose --project-directory zuul/network-tests up

diff --git a/documentation/vsomeipConfiguration.md b/documentation/vsomeipConfiguration.md
@@ -1816,6 +1816,8 @@ To enable service-specific logs, provide a space- or colon-separated list of Ser
 
 - **VSOMEIP_LOAD_PLUGINS** - Used to load external plugins.
 
+- **VSOMEIP_ABORT_ON_CRIT_SYSCALL_ERROR** - Used to abort when incorrect state (e.g. errno EBADF) is detected for critical syscall/libc calls such as recvfrom/sendto/epoll_wait. Under these situations, the process using libvsomeip is incorrectly handling file descriptors (e.g. double close with invalid fd value) leading to a libvsomeip state that is incorrect and not recoverable. The abort will cause a core dump and platforms can decide on recovery strategies (e.g. restarting service). Any non-empty value is considered true.
+
 <details><summary>Using environment variables</summary>
 
 In the following example the application `my_vsomeip_application` is started.

diff --git a/examples/routingmanagerd/routingmanagerd.cpp b/examples/routingmanagerd/routingmanagerd.cpp
@@ -78,8 +78,9 @@ int routingmanagerd_process(bool _is_quiet) {
         return -1;
     }
 
-    // Create the application object
+    // Create the application object, and initialize it before sighandler thread starts
     its_application = its_runtime->create_application("routingmanagerd");
+    auto its_app_initialized = its_application->init();
 #ifndef VSOMEIP_ENABLE_SIGNAL_HANDLING
     std::thread sighandler_thread([]() {
         // Unblock signals for this thread only
@@ -112,7 +113,7 @@ int routingmanagerd_process(bool _is_quiet) {
         }
     });
 #endif
-    if (its_application->init()) {
+    if (its_app_initialized) {
         if (its_application->is_routing()) {
             its_application->start();
 #ifndef VSOMEIP_ENABLE_SIGNAL_HANDLING

diff --git a/implementation/configuration/include/configuration_impl.hpp b/implementation/configuration/include/configuration_impl.hpp
@@ -312,7 +312,6 @@ class configuration_impl : public configuration, public std::enable_shared_from_
     std::set<std::pair<port_t, port_t>> load_routing_guest_port_range(const boost::property_tree::ptree& _tree) const;
 
     bool load_routing_credentials(const configuration_element& _element); // compatibility
-    void load_routing_client_ports(const configuration_element& _element); // compatibility
 
     void load_tracing(const configuration_element& _element);
     void load_trace_channels(const boost::property_tree::ptree& _tree);
@@ -340,11 +339,9 @@ class configuration_impl : public configuration, public std::enable_shared_from_
     void load_shutdown_timeout(const configuration_element& _element);
 
     void load_service_discovery(const configuration_element& _element);
-    void load_delays(const boost::property_tree::ptree& _tree);
 
     void load_npdu_default_timings(const configuration_element& _element);
     void load_services(const configuration_element& _element);
-    void load_servicegroup(const boost::property_tree::ptree& _tree);
     void load_service(const boost::property_tree::ptree& _tree, const std::string& _unicast_address);
     void load_event(std::shared_ptr<service>& _service, const boost::property_tree::ptree& _tree);
     void load_eventgroup(std::shared_ptr<service>& _service, const boost::property_tree::ptree& _tree);

diff --git a/implementation/configuration/include/internal.hpp.in b/implementation/configuration/include/internal.hpp.in
@@ -20,6 +20,7 @@
 #define VSOMEIP_ENV_MANDATORY_CONFIGURATION_FILES "VSOMEIP_MANDATORY_CONFIGURATION_FILES"
 #define VSOMEIP_ENV_LOAD_PLUGINS                "VSOMEIP_LOAD_PLUGINS"
 #define VSOMEIP_ENV_CLIENTSIDELOGGING           "VSOMEIP_CLIENTSIDELOGGING"
+#define VSOMEIP_ENV_ABORT_ON_CRIT_SYSCALL_ERROR "VSOMEIP_ABORT_ON_CRIT_SYSCALL_ERROR"
 
 #define VSOMEIP_DEFAULT_CONFIGURATION_FILE      "@DEFAULT_CONFIGURATION_FILE@"
 #define VSOMEIP_LOCAL_CONFIGURATION_FILE        "./vsomeip.json"
@@ -145,7 +146,7 @@
 #define MAX_ENDPOINT_WAIT_INTERVAL              160
 #define SUM_ENDPOINT_WAIT_INTERVAL              500
 
-#if defined(__linux__) || defined(ANDROID) || defined(__QNX__)
+#if defined(__linux__) || defined(__QNX__)
 #include <pthread.h>
 #endif
 

diff --git a/implementation/configuration/include/internal_android.hpp b/implementation/configuration/include/internal_android.hpp
@@ -20,6 +20,7 @@
 #define VSOMEIP_ENV_MANDATORY_CONFIGURATION_FILES "VSOMEIP_MANDATORY_CONFIGURATION_FILES"
 #define VSOMEIP_ENV_LOAD_PLUGINS                "VSOMEIP_LOAD_PLUGINS"
 #define VSOMEIP_ENV_CLIENTSIDELOGGING           "VSOMEIP_CLIENTSIDELOGGING"
+#define VSOMEIP_ENV_ABORT_ON_CRIT_SYSCALL_ERROR "VSOMEIP_ABORT_ON_CRIT_SYSCALL_ERROR"
 
 #define VSOMEIP_DEFAULT_CONFIGURATION_FILE      "/vendor/run/etc/vsomeip.json"
 #define VSOMEIP_LOCAL_CONFIGURATION_FILE        "./vsomeip.json"

diff --git a/implementation/configuration/include/service.hpp b/implementation/configuration/include/service.hpp
@@ -25,9 +25,6 @@ struct service {
     uint16_t reliable_;
     uint16_t unreliable_;
 
-    std::string multicast_address_;
-    uint16_t multicast_port_;
-
     std::string protocol_;
 
     // [0] = debounce_time