Skip to content

Add Posix netinet_in.h additions #81138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nashif merged 8 commits into from
Nov 16, 2024
Merged

Add Posix netinet_in.h additions #81138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
71f072c
tests: posix: headers: net: sin6_scope_id is supported
jukkar Nov 8, 2024
291f745
tests: posix: headers: net: Add check for in6addr_any variable
jukkar Nov 8, 2024
f81fd97
tests: posix: headers: net: Add IPv6 join/leave group
jukkar Nov 8, 2024
7fa4378
tests: posix: headers: net: Mark unicast/multicast hops supported
jukkar Nov 8, 2024
a9c940a
tests: posix: headers: net: Add INADDR_BROADCAST definition
jukkar Nov 8, 2024
63b4eb1
tests: posix: headers: net: Add various IPv6 address check macros
jukkar Nov 8, 2024
ef80c04
tests: posix: headers: net: Add test for ipv6_mreq
jukkar Nov 8, 2024
d3e9754
tests: posix: headers: net: Convert to use zexpect
jukkar Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/zephyr/net/net_ip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,9 @@ extern const struct in6_addr in6addr_loopback;
/** IPv4 any address */
#define INADDR_ANY 0

/** IPv4 broadcast address */
#define INADDR_BROADCAST 0xffffffff

/** IPv4 address initializer */
#define INADDR_ANY_INIT { { { INADDR_ANY } } }

Expand Down
46 changes: 46 additions & 0 deletions include/zephyr/net/socket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,6 +1225,12 @@
/** Leave IPv6 multicast group. */
#define IPV6_DROP_MEMBERSHIP 21

/** Join IPv6 multicast group. */
#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP

/** Leave IPv6 multicast group. */
#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP

/**
* @brief Struct used when joining or leaving a IPv6 multicast group.
*/
Expand Down Expand Up @@ -1289,6 +1295,46 @@
#define SOMAXCONN 128
/** @} */

/**
* @name Macros for checking special IPv6 addresses.
* @{
*/
/** Check unspecified IPv6 address. */
#define IN6_IS_ADDR_UNSPECIFIED(addr) \
net_ipv6_addr_cmp(net_ipv6_unspecified_address(), addr)

Check notice on line 1305 in include/zephyr/net/socket.h

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

include/zephyr/net/socket.h:1305 
-#define IN6_IS_ADDR_UNSPECIFIED(addr) \
-	net_ipv6_addr_cmp(net_ipv6_unspecified_address(), addr)
+#define IN6_IS_ADDR_UNSPECIFIED(addr) net_ipv6_addr_cmp(net_ipv6_unspecified_address(), addr)
/** Check loopback IPv6 address. */
#define IN6_IS_ADDR_LOOPBACK(addr) net_ipv6_is_addr_loopback(addr)

/** Check IPv6 multicast address */
#define IN6_IS_ADDR_MULTICAST(addr) net_ipv6_is_addr_mcast(addr)

/** Check IPv6 link local address */
#define IN6_IS_ADDR_LINKLOCAL(addr) net_ipv6_is_ll_addr(addr)

/** Check IPv6 site local address */
#define IN6_IS_ADDR_SITELOCAL(addr) net_ipv6_is_sl_addr(addr)

/** Check IPv6 v4 mapped address */
#define IN6_IS_ADDR_V4MAPPED(addr) net_ipv6_addr_is_v4_mapped(addr)

/** Check IPv6 multicast global address */
#define IN6_IS_ADDR_MC_GLOBAL(addr) net_ipv6_is_addr_mcast_global(addr)

/** Check IPv6 multicast node local address */
#define IN6_IS_ADDR_MC_NODELOCAL(addr) net_ipv6_is_addr_mcast_iface(addr)

/** Check IPv6 multicast link local address */
#define IN6_IS_ADDR_MC_LINKLOCAL(addr) net_ipv6_is_addr_mcast_link(addr)

/** Check IPv6 multicast site local address */
#define IN6_IS_ADDR_MC_SITELOCAL(addr) net_ipv6_is_addr_mcast_site(addr)

/** Check IPv6 multicast organization local address */
#define IN6_IS_ADDR_MC_ORGLOCAL(addr) net_ipv6_is_addr_mcast_org(addr)

/** @} */

/** @cond INTERNAL_HIDDEN */
/**
* @brief Registration information for a given BSD socket family.
Expand Down
121 changes: 68 additions & 53 deletions tests/posix/headers/src/netinet_in_h.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,68 +21,83 @@
*/
ZTEST(posix_headers, test_netinet_in_h)
{
zassert_equal(sizeof(in_port_t), sizeof(uint16_t));
zassert_equal(sizeof(in_addr_t), sizeof(uint32_t));
zexpect_equal(sizeof(in_port_t), sizeof(uint16_t));
zexpect_equal(sizeof(in_addr_t), sizeof(uint32_t));

zassert_not_equal(-1, offsetof(struct in_addr, s_addr));
zexpect_not_equal(-1, offsetof(struct in_addr, s_addr));

zassert_not_equal(-1, offsetof(struct sockaddr_in, sin_family));
zassert_not_equal(-1, offsetof(struct sockaddr_in, sin_port));
zassert_not_equal(-1, offsetof(struct sockaddr_in, sin_addr));
zexpect_not_equal(-1, offsetof(struct sockaddr_in, sin_family));
zexpect_not_equal(-1, offsetof(struct sockaddr_in, sin_port));
zexpect_not_equal(-1, offsetof(struct sockaddr_in, sin_addr));

zassert_not_equal(-1, offsetof(struct in6_addr, s6_addr));
zassert_equal(sizeof(((struct in6_addr *)NULL)->s6_addr), 16 * sizeof(uint8_t));
zexpect_not_equal(-1, offsetof(struct in6_addr, s6_addr));
zexpect_equal(sizeof(((struct in6_addr *)NULL)->s6_addr), 16 * sizeof(uint8_t));

zassert_not_equal(-1, offsetof(struct sockaddr_in6, sin6_family));
zassert_not_equal(-1, offsetof(struct sockaddr_in6, sin6_port));
zexpect_not_equal(-1, offsetof(struct sockaddr_in6, sin6_family));
zexpect_not_equal(-1, offsetof(struct sockaddr_in6, sin6_port));
/* not implemented */
/* zassert_not_equal(-1, offsetof(struct sockaddr_in6, sin6_flowinfo)); */
zassert_not_equal(-1, offsetof(struct sockaddr_in6, sin6_addr));
/* not implemented */
/* zassert_not_equal(-1, offsetof(struct sockaddr_in6, scope_id)); */
/* zexpect_not_equal(-1, offsetof(struct sockaddr_in6, sin6_flowinfo)); */
zexpect_not_equal(-1, offsetof(struct sockaddr_in6, sin6_addr));
zexpect_not_equal(-1, offsetof(struct sockaddr_in6, sin6_scope_id));

zassert_not_null(&in6addr_loopback);
zexpect_not_null(&in6addr_any);
zexpect_not_null(&in6addr_loopback);
struct in6_addr any6 = IN6ADDR_ANY_INIT;
struct in6_addr lo6 = IN6ADDR_LOOPBACK_INIT;

/* not implemented */
/* zassert_not_equal(-1, offsetof(struct ipv6_mreq, ipv6mr_multiaddr)); */
/* not implemented */
/* zassert_not_equal(-1, offsetof(struct ipv6_mreq, ipv6mr_interface)); */

zassert_not_equal(-1, IPPROTO_IP);
zassert_not_equal(-1, IPPROTO_IPV6);
zassert_not_equal(-1, IPPROTO_ICMP);
zassert_not_equal(-1, IPPROTO_RAW);
zassert_not_equal(-1, IPPROTO_TCP);
zassert_not_equal(-1, IPPROTO_UDP);

zassert_not_equal(-1, INADDR_ANY);
/* zassert_not_equal(-1, INADDR_BROADCAST); */ /* not implemented */

zassert_equal(INET_ADDRSTRLEN, 16);
zassert_equal(INET6_ADDRSTRLEN, 46);

/* zassert_not_equal(-1, IPV6_JOIN_GROUP); */ /* not implemented */
/* zassert_not_equal(-1, IPV6_LEAVE_GROUP); */ /* not implemented */
/* zassert_not_equal(-1, IPV6_MULTICAST_HOPS); */ /* not implemented */
/* zassert_not_equal(-1, IPV6_MULTICAST_IF); */ /* not implemented */
/* zassert_not_equal(-1, IPV6_MULTICAST_LOOP); */ /* not implemented */
/* zassert_not_equal(-1, IPV6_UNICAST_HOPS); */ /* not implemented */
zassert_not_equal(-1, IPV6_V6ONLY);

/* IN6_IS_ADDR_UNSPECIFIED(&any6); */ /* not implemented */
/* IN6_IS_ADDR_LOOPBACK(&lo6); */ /* not implemented */

/* IN6_IS_ADDR_MULTICAST(&lo6); */ /* not implemented */
/* IN6_IS_ADDR_LINKLOCAL(&lo6); */ /* not implemented */
/* IN6_IS_ADDR_SITELOCAL(&lo6); */ /* not implemented */
/* IN6_IS_ADDR_V4MAPPED(&lo6); */ /* not implemented */
struct in6_addr mcast6 = { { { 0xff, 0 } } };
struct in6_addr ll6 = { { { 0xfe, 0x80, 0x01, 0x02,
0, 0, 0, 0, 0, 0x01 } } };
struct in6_addr sl6 = { { { 0xfe, 0xc0, 0, 0x01, 0x02 } } };
struct in6_addr v4mapped = { { { 0, 0, 0, 0, 0, 0, 0, 0,
0xff, 0xff, 0xff, 0xff, 0xc0, 0, 0x02, 0x01 } } };
struct in6_addr mcnl6 = { { { 0xff, 0x01, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0x01 } } };
struct in6_addr mcll6 = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0x01 } } };
struct in6_addr mcsl6 = { { { 0xff, 0x05, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0x01 } } };
struct in6_addr mcol6 = { { { 0xff, 0x08, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0x01 } } };
struct in6_addr mcg6 = { { { 0xff, 0x0e, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0x01 } } };

Check notice on line 64 in tests/posix/headers/src/netinet_in_h.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

tests/posix/headers/src/netinet_in_h.c:64 
-	struct in6_addr mcast6 = { { { 0xff, 0 } } };
-	struct in6_addr ll6 = { { { 0xfe, 0x80, 0x01, 0x02,
-				0, 0, 0, 0, 0, 0x01 } } };
-	struct in6_addr sl6  = { { { 0xfe, 0xc0, 0, 0x01, 0x02 } } };
-	struct in6_addr v4mapped = { { { 0, 0, 0, 0, 0, 0, 0, 0,
-				0xff, 0xff, 0xff, 0xff, 0xc0, 0, 0x02, 0x01 } } };
-	struct in6_addr mcnl6 = { { { 0xff, 0x01, 0, 0, 0, 0, 0, 0,
-				0, 0, 0, 0, 0, 0, 0, 0x01 } } };
-	struct in6_addr mcll6 = { { { 0xff, 0x02, 0, 0, 0, 0, 0, 0,
-				0, 0, 0, 0, 0, 0, 0, 0x01 } } };
-	struct in6_addr mcsl6 = { { { 0xff, 0x05, 0, 0, 0, 0, 0, 0,
-				0, 0, 0, 0, 0, 0, 0, 0x01 } } };
-	struct in6_addr mcol6 = { { { 0xff, 0x08, 0, 0, 0, 0, 0, 0,
-				0, 0, 0, 0, 0, 0, 0, 0x01 } } };
-	struct in6_addr mcg6 = { { { 0xff, 0x0e, 0, 0, 0, 0, 0, 0,
-				0, 0, 0, 0, 0, 0, 0, 0x01 } } };
+	struct in6_addr mcast6 = {{{0xff, 0}}};
+	struct in6_addr ll6 = {{{0xfe, 0x80, 0x01, 0x02, 0, 0, 0, 0, 0, 0x01}}};
+	struct in6_addr sl6 = {{{0xfe, 0xc0, 0, 0x01, 0x02}}};
+	struct in6_addr v4mapped = {
+		{{0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0xc0, 0, 0x02, 0x01}}};
+	struct in6_addr mcnl6 = {{{0xff, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01}}};
+	struct in6_addr mcll6 = {{{0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01}}};
+	struct in6_addr mcsl6 = {{{0xff, 0x05, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01}}};
+	struct in6_addr mcol6 = {{{0xff, 0x08, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01}}};
+	struct in6_addr mcg6 = {{{0xff, 0x0e, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01}}};
zexpect_not_equal(-1, offsetof(struct ipv6_mreq, ipv6mr_multiaddr));
zexpect_not_equal(-1, offsetof(struct ipv6_mreq, ipv6mr_ifindex));

zexpect_not_equal(-1, IPPROTO_IP);
zexpect_not_equal(-1, IPPROTO_IPV6);
zexpect_not_equal(-1, IPPROTO_ICMP);
zexpect_not_equal(-1, IPPROTO_RAW);
zexpect_not_equal(-1, IPPROTO_TCP);
zexpect_not_equal(-1, IPPROTO_UDP);

zexpect_not_equal(-1, INADDR_ANY);
zexpect_equal(0xffffffff, INADDR_BROADCAST);

zexpect_equal(INET_ADDRSTRLEN, 16);
zexpect_equal(INET6_ADDRSTRLEN, 46);

zexpect_equal(IPV6_ADD_MEMBERSHIP, IPV6_JOIN_GROUP);
zexpect_equal(IPV6_DROP_MEMBERSHIP, IPV6_LEAVE_GROUP);
zexpect_not_equal(-1, IPV6_MULTICAST_HOPS);
/* zexpect_not_equal(-1, IPV6_MULTICAST_IF); */ /* not implemented */
/* zexpect_not_equal(-1, IPV6_MULTICAST_LOOP); */ /* not implemented */

Check notice on line 85 in tests/posix/headers/src/netinet_in_h.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

tests/posix/headers/src/netinet_in_h.c:85 
-	/* zexpect_not_equal(-1, IPV6_MULTICAST_IF); */ /* not implemented */
+	/* zexpect_not_equal(-1, IPV6_MULTICAST_IF); */   /* not implemented */
zexpect_not_equal(-1, IPV6_UNICAST_HOPS);
zexpect_not_equal(-1, IPV6_V6ONLY);

zexpect_true(IN6_IS_ADDR_UNSPECIFIED(&any6));
zexpect_true(IN6_IS_ADDR_LOOPBACK(&lo6));

zexpect_true(IN6_IS_ADDR_MULTICAST(&mcast6));
zexpect_true(IN6_IS_ADDR_LINKLOCAL(&ll6));
zexpect_true(IN6_IS_ADDR_SITELOCAL(&sl6));
zexpect_true(IN6_IS_ADDR_V4MAPPED(&v4mapped));
/* IN6_IS_ADDR_V4COMPAT(&lo6); */ /* not implemented */
/* IN6_IS_ADDR_MC_NODELOCAL(&lo6); */ /* not implemented */
/* IN6_IS_ADDR_MC_LINKLOCAL(&lo6); */ /* not implemented */
/* IN6_IS_ADDR_MC_SITELOCAL(&lo6); */ /* not implemented */
/* IN6_IS_ADDR_MC_ORGLOCAL(&lo6); */ /* not implemented */
/* IN6_IS_ADDR_MC_GLOBAL(&lo6); */ /* not implemented */
zexpect_true(IN6_IS_ADDR_MC_NODELOCAL(&mcnl6));
zexpect_true(IN6_IS_ADDR_MC_LINKLOCAL(&mcll6));
zexpect_true(IN6_IS_ADDR_MC_SITELOCAL(&mcsl6));
zexpect_true(IN6_IS_ADDR_MC_ORGLOCAL(&mcol6));
zexpect_true(IN6_IS_ADDR_MC_GLOBAL(&mcg6));
}
#pragma GCC diagnostic pop
Loading