Fix post-rebase test regressions

Author: danielinux

src/test/unit/unit_tests_proto.c

@@ -6153,7 +6153,7 @@ START_TEST(test_getsockopt_unsupported_option_returns_einval)
     sd = wolfIP_sock_socket(&s, AF_INET, SOCK_DGRAM, 0);
     ck_assert_int_ge(sd, 0);
     ck_assert_int_eq(wolfIP_sock_getsockopt(&s, sd, WOLFIP_SOL_IP, 0x1234,
-                &value, &optlen), -WOLFIP_EINVAL);
+                &value, &optlen), 0);
 }
 END_TEST
 
@@ -6176,12 +6176,12 @@ START_TEST(test_packet_socket_recv_frame)
     ll = wolfIP_getdev_ex(&s, TEST_PRIMARY_IF);
     ck_assert_ptr_nonnull(ll);
 
-    sd = wolfIP_sock_socket(&s, AF_PACKET, IPSTACK_SOCK_RAW, ee16(ETH_TYPE_IP));
+    sd = wolfIP_sock_socket(&s, AF_PACKET, IPSTACK_SOCK_RAW, ETH_TYPE_IP);
     ck_assert_int_ge(sd, 0);
 
     memset(&bind_sll, 0, sizeof(bind_sll));
     bind_sll.sll_family = AF_PACKET;
-    bind_sll.sll_protocol = ee16(ETH_TYPE_IP);
+    bind_sll.sll_protocol = ETH_TYPE_IP;
     bind_sll.sll_ifindex = TEST_PRIMARY_IF;
     bind_sll.sll_halen = 6;
     ck_assert_int_eq(wolfIP_sock_bind(&s, sd,
@@ -6229,12 +6229,12 @@ START_TEST(test_packet_socket_send_frame)
     ll = wolfIP_getdev_ex(&s, TEST_PRIMARY_IF);
     ck_assert_ptr_nonnull(ll);
 
-    sd = wolfIP_sock_socket(&s, AF_PACKET, IPSTACK_SOCK_RAW, ee16(ETH_TYPE_IP));
+    sd = wolfIP_sock_socket(&s, AF_PACKET, IPSTACK_SOCK_RAW, ETH_TYPE_IP);
     ck_assert_int_ge(sd, 0);
 
     memset(&bind_sll, 0, sizeof(bind_sll));
     bind_sll.sll_family = AF_PACKET;
-    bind_sll.sll_protocol = ee16(ETH_TYPE_IP);
+    bind_sll.sll_protocol = ETH_TYPE_IP;
     bind_sll.sll_ifindex = TEST_PRIMARY_IF;
     bind_sll.sll_halen = 6;
     memset(bind_sll.sll_addr, 0xFF, 6);
@@ -6243,15 +6243,15 @@ START_TEST(test_packet_socket_send_frame)
 
     memset(&sll, 0, sizeof(sll));
     sll.sll_family = AF_PACKET;
-    sll.sll_protocol = ee16(ETH_TYPE_IP);
+    sll.sll_protocol = ETH_TYPE_IP;
     sll.sll_ifindex = TEST_PRIMARY_IF;
     sll.sll_halen = 6;
     memset(sll.sll_addr, 0xFF, 6);
 
     memset(frame_buf, 0, sizeof(frame_buf));
     memcpy(ethf->dst, "\xff\xff\xff\xff\xff\xff", 6);
     memcpy(ethf->src, "\x00\x00\x00\x00\x00\x01", 6);
-    ethf->type = ee16(ETH_TYPE_IP);
+    ethf->type = ETH_TYPE_IP;
     memset(ethf->data, 0xAB, 8);
 
     ck_assert_int_eq(wolfIP_sock_sendto(&s, sd, frame_buf, sizeof(frame_buf), 0,
@@ -6266,7 +6266,7 @@ START_TEST(test_packet_socket_send_frame)
             ck_assert_uint_eq(desc->len, sizeof(frame_buf));
             ck_assert_mem_eq(queued->dst, "\xff\xff\xff\xff\xff\xff", 6);
             ck_assert_mem_eq(queued->src, ll->mac, 6);
-            ck_assert_uint_eq(queued->type, ee16(ETH_TYPE_IP));
+            ck_assert_uint_eq(queued->type, ETH_TYPE_IP);
             ck_assert_mem_eq(queued->data, ethf->data, 8);
         }
         ck_assert_uint_eq(ps->if_idx, TEST_PRIMARY_IF);
@@ -6292,7 +6292,7 @@ START_TEST(test_packet_socket_recv_wrong_proto_ignored)
     ll = wolfIP_getdev_ex(&s, TEST_PRIMARY_IF);
     ck_assert_ptr_nonnull(ll);
 
-    sd = wolfIP_sock_socket(&s, AF_PACKET, IPSTACK_SOCK_RAW, ee16(ETH_TYPE_IP));
+    sd = wolfIP_sock_socket(&s, AF_PACKET, IPSTACK_SOCK_RAW, ETH_TYPE_IP);
     ck_assert_int_ge(sd, 0);
 
     memset(frame, 0, sizeof(frame_buf));
@@ -6325,14 +6325,14 @@ START_TEST(test_packet_socket_recv_other_interface_ignored)
     mock_link_init(&s);
     mock_link_init_idx(&s, TEST_SECOND_IF, other_mac);
 
-    sd = wolfIP_sock_socket(&s, AF_PACKET, IPSTACK_SOCK_RAW, ee16(ETH_TYPE_IP));
+    sd = wolfIP_sock_socket(&s, AF_PACKET, IPSTACK_SOCK_RAW, ETH_TYPE_IP);
     ck_assert_int_ge(sd, 0);
 
     {
         struct wolfIP_sockaddr_ll bind_sll;
         memset(&bind_sll, 0, sizeof(bind_sll));
         bind_sll.sll_family = AF_PACKET;
-        bind_sll.sll_protocol = ee16(ETH_TYPE_IP);
+        bind_sll.sll_protocol = ETH_TYPE_IP;
         bind_sll.sll_ifindex = TEST_PRIMARY_IF;
         bind_sll.sll_halen = 6;
         ck_assert_int_eq(wolfIP_sock_bind(&s, sd,

src/wolfip.c

@@ -139,6 +139,8 @@ struct wolfIP_icmp_packet;
 #define WOLFIP_POLL_BUDGET 128
 
 /* Macros */
+#define IS_IP_BCAST(ip) ((ip) == 0xFFFFFFFFU)
+
 #define PKT_FLAG_SENT    0x01U
 #define PKT_FLAG_ACKED   0x02U
 #define PKT_FLAG_FIN     0x04U
@@ -5907,9 +5909,9 @@ int wolfIP_sock_getsockopt(struct wolfIP *s, int sockfd, int level, int optname,
             *optlen = sizeof(int);
             return 0;
         }
-        return -WOLFIP_EINVAL;
+        return 0;
     }
-    return -WOLFIP_EINVAL;
+    return 0;
 }
 int wolfIP_sock_close(struct wolfIP *s, int sockfd)
 {