Release v2.2.1

eProsima · Sep 28, 2022 · fda7242 · fda7242
2 parents 6f4edd2 + f929700
commit fda7242
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -90,7 +90,7 @@ list(APPEND _deps "microcdr\;${_microcdr_version}")
 ###############################################################################
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 if(NOT UCLIENT_SUPERBUILD)
-    project(microxrcedds_client VERSION "2.2.0" LANGUAGES C)
+    project(microxrcedds_client VERSION "2.2.1" LANGUAGES C)
 else()
     project(uclient_superbuild NONE)
     include(${PROJECT_SOURCE_DIR}/cmake/SuperBuild.cmake)

diff --git a/src/c/profile/discovery/transport/udp_transport_datagram_posix_nopoll.c b/src/c/profile/discovery/transport/udp_transport_datagram_posix_nopoll.c
@@ -67,7 +67,10 @@ bool uxr_udp_recv_datagram(
     tv.tv_sec = timeout / 1000;
     tv.tv_usec = (timeout % 1000) * 1000;
 
-    setsockopt(transport->fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+    if (0 != setsockopt(transport->fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)))
+    {
+        return false;
+    }
 
     ssize_t bytes_received = recv(transport->fd, (void*)transport->buffer, sizeof(transport->buffer), 0);
     if (-1 != bytes_received)

diff --git a/src/c/profile/transport/ip/tcp/tcp_transport_posix_nopoll.c b/src/c/profile/transport/ip/tcp/tcp_transport_posix_nopoll.c
@@ -102,7 +102,11 @@ size_t uxr_read_tcp_data_platform(
     tv.tv_sec = timeout / 1000;
     tv.tv_usec = (timeout % 1000) * 1000;
 
-    setsockopt(platform->fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+    if (0 != setsockopt(platform->fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)))
+    {
+        *errcode = 1;
+        return 0;
+    }
 
     ssize_t bytes_received = recv(platform->fd, (void*)buf, len, 0);
     if (-1 != bytes_received)

diff --git a/src/c/profile/transport/ip/udp/udp_transport_posix_nopoll.c b/src/c/profile/transport/ip/udp/udp_transport_posix_nopoll.c
@@ -102,7 +102,11 @@ size_t uxr_read_udp_data_platform(
     tv.tv_sec = timeout / 1000;
     tv.tv_usec = (timeout % 1000) * 1000;
 
-    setsockopt(platform->fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+    if (0 != setsockopt(platform->fd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)))
+    {
+        *errcode = 1;
+        return 0;
+    }
 
     ssize_t bytes_received = recv(platform->fd, (void*)buf, len, 0);
     if (-1 != bytes_received)