Addressed copilot comments:

- return the remote port in network order
- return the correct error code in woldIP_sock_recvfrom()
- fixed test cases

Author: danielinux

src/test/unit/unit.c

@@ -1035,7 +1035,7 @@ START_TEST(test_udp_sendto_and_recvfrom)
             (struct wolfIP_sockaddr *)&from, &from_len);
     ck_assert_int_eq(ret, (int)sizeof(payload));
     ck_assert_mem_eq(rxbuf, payload, sizeof(payload));
-    ck_assert_uint_eq(from.sin_port, remote_port);
+    ck_assert_uint_eq(from.sin_port, ee16(remote_port));
 }
 END_TEST
 
@@ -1202,7 +1202,7 @@ START_TEST(test_udp_recvfrom_null_addrlen)
     memset(&from, 0, sizeof(from));
     ret = wolfIP_sock_recvfrom(&s, sd, rxbuf, sizeof(rxbuf), 0,
             (struct wolfIP_sockaddr *)&from, NULL);
-    ck_assert_int_eq(ret, -1);
+    ck_assert_int_eq(ret, -WOLFIP_EINVAL);
 }
 END_TEST
 
@@ -1661,13 +1661,13 @@ START_TEST(test_sock_recvfrom_short_addrlen)
     ck_assert_int_gt(udp_sd, 0);
     alen = (socklen_t)1;
     ck_assert_int_eq(wolfIP_sock_recvfrom(&s, udp_sd, buf, sizeof(buf), 0,
-            (struct wolfIP_sockaddr *)&sin, &alen), -1);
+            (struct wolfIP_sockaddr *)&sin, &alen), -WOLFIP_EINVAL);
 
     icmp_sd = wolfIP_sock_socket(&s, AF_INET, IPSTACK_SOCK_DGRAM, WI_IPPROTO_ICMP);
     ck_assert_int_gt(icmp_sd, 0);
     alen = (socklen_t)1;
     ck_assert_int_eq(wolfIP_sock_recvfrom(&s, icmp_sd, buf, sizeof(buf), 0,
-            (struct wolfIP_sockaddr *)&sin, &alen), -1);
+            (struct wolfIP_sockaddr *)&sin, &alen), -WOLFIP_EINVAL);
 }
 END_TEST
 START_TEST(test_dns_query_and_callback_a)
@@ -4487,7 +4487,7 @@ START_TEST(test_sock_recvfrom_udp_short_addrlen)
     ck_assert_int_gt(udp_sd, 0);
 
     ck_assert_int_eq(wolfIP_sock_recvfrom(&s, udp_sd, buf, sizeof(buf), 0,
-            (struct wolfIP_sockaddr *)&sin, &alen), -1);
+            (struct wolfIP_sockaddr *)&sin, &alen), -WOLFIP_EINVAL);
 }
 END_TEST
 
@@ -4506,7 +4506,7 @@ START_TEST(test_sock_recvfrom_icmp_short_addrlen)
     ck_assert_int_gt(icmp_sd, 0);
 
     ck_assert_int_eq(wolfIP_sock_recvfrom(&s, icmp_sd, buf, sizeof(buf), 0,
-            (struct wolfIP_sockaddr *)&sin, &alen), -1);
+            (struct wolfIP_sockaddr *)&sin, &alen), -WOLFIP_EINVAL);
 }
 END_TEST
 

src/wolfip.c

@@ -2648,9 +2648,9 @@ int wolfIP_sock_recvfrom(struct wolfIP *s, int sockfd, void *buf, size_t len, in
             return -WOLFIP_EINVAL;
         ts = &s->udpsockets[SOCKET_UNMARK(sockfd)];
         if (sin && !addrlen)
-            return -1;
+            return -WOLFIP_EINVAL;
         if (sin && *addrlen < sizeof(struct wolfIP_sockaddr_in))
-            return -1;
+            return -WOLFIP_EINVAL;
         if (addrlen) *addrlen = sizeof(struct wolfIP_sockaddr_in);
         if (fifo_len(&ts->sock.udp.rxbuf) == 0)
             return -WOLFIP_EAGAIN;
@@ -2663,7 +2663,7 @@ int wolfIP_sock_recvfrom(struct wolfIP *s, int sockfd, void *buf, size_t len, in
         }
         if (sin) {
             sin->sin_family = AF_INET;
-            sin->sin_port = ee16(udp->src_port);
+            sin->sin_port = udp->src_port;
             sin->sin_addr.s_addr = udp->ip.src;
         }
         seg_len = ee16(udp->len) - UDP_HEADER_LEN;
@@ -2677,8 +2677,10 @@ int wolfIP_sock_recvfrom(struct wolfIP *s, int sockfd, void *buf, size_t len, in
         if (SOCKET_UNMARK(sockfd) >= MAX_ICMPSOCKETS)
             return -WOLFIP_EINVAL;
         ts = &s->icmpsockets[SOCKET_UNMARK(sockfd)];
+        if (sin && !addrlen)
+            return -WOLFIP_EINVAL;
         if (sin && *addrlen < sizeof(struct wolfIP_sockaddr_in))
-            return -1;
+            return -WOLFIP_EINVAL;
         if (addrlen)
             *addrlen = sizeof(struct wolfIP_sockaddr_in);
         desc = fifo_peek(&ts->sock.udp.rxbuf);