Merge pull request #418

Fix Zephyr discovery IPv4 conversion

Author: EugenioCollado

src/c/profile/discovery/transport/udp_transport_datagram_posix.c

@@ -84,7 +84,7 @@ void uxr_bytes_to_ip(
         char* ip)
 {
     struct in_addr addr;
-    addr.s_addr = (in_addr_t)(*bytes + (*(bytes + 1) << 8) + (*(bytes + 2) << 16) + (*(bytes + 3) << 24));
+    memcpy(&addr.s_addr, bytes, sizeof(addr.s_addr));
     char* internal_ip = inet_ntoa(addr);
     strcpy(ip, internal_ip);
 }

src/c/profile/discovery/transport/udp_transport_datagram_posix_nopoll.c

@@ -88,7 +88,7 @@ void uxr_bytes_to_ip(
         char* ip)
 {
     struct in_addr addr;
-    addr.s_addr = (in_addr_t)(*bytes + (*(bytes + 1) << 8) + (*(bytes + 2) << 16) + (*(bytes + 3) << 24));
+    memcpy(&addr.s_addr, bytes, sizeof(addr.s_addr));
     char* internal_ip = inet_ntoa(addr);
     strcpy(ip, internal_ip);
 }

test/unitary/CMakeLists.txt

@@ -89,4 +89,6 @@ unitary_test(SessionInfo        session/SessionInfo.cpp)
 unitary_test(Session            session/Session.cpp)
 unitary_test(WriteReadAccess    session/WriteReadAccess.cpp)
 unitary_test(Utils              session/Utils.cpp)
+unitary_test(DiscoveryTransport profile/DiscoveryTransport.cpp)
+target_link_libraries(DiscoveryTransport PRIVATE microxrcedds_client)
 

test/unitary/profile/DiscoveryTransport.cpp

@@ -0,0 +1,16 @@
+#include <gtest/gtest.h>
+
+extern "C"
+{
+#include <c/profile/discovery/transport/udp_transport_datagram_internal.h>
+}
+
+TEST(DiscoveryTransportTest, ConvertsIpv4AddressBytes)
+{
+    const uint8_t address[] = {192, 168, 1, 42};
+    char ip[16] = {};
+
+    uxr_bytes_to_ip(address, ip);
+
+    EXPECT_STREQ("192.168.1.42", ip);
+}