michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: Fix network API calls that were not namespaced

Browse Source 
Some of the networking calls were not namespaced so fix it.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
This commit is contained in:
Jukka Rissanen
2025-11-19 08:33:17 +02:00
committed by Carles Cufí
parent 506beae4bb
commit 8046a24104
19 changed files with 115 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ppp.c
View File

@@ -827,9 +827,9 @@ static int ppp_send(const struct device *dev, struct net_pkt *pkt)
*/
if (!net_pkt_is_ppp(pkt)) {
if (net_pkt_family(pkt) == NET_AF_INET) {
protocol = htons(PPP_IP);
protocol = net_htons(PPP_IP);
} else if (net_pkt_family(pkt) == NET_AF_INET6) {
protocol = htons(PPP_IPV6);
protocol = net_htons(PPP_IPV6);
} else {
return -EPROTONOSUPPORT;
}
@@ -846,12 +846,12 @@ static int ppp_send(const struct device *dev, struct net_pkt *pkt)
sizeof(sync_addr_ctrl), send_off);
if (protocol > 0) {
escaped = htons(ppp_escape_byte(protocol, &offset));
escaped = net_htons(ppp_escape_byte(protocol, &offset));
send_off = ppp_send_bytes(ppp, (uint8_t *)&escaped + offset,
offset ? 1 : 2,
send_off);
escaped = htons(ppp_escape_byte(protocol >> 8, &offset));
escaped = net_htons(ppp_escape_byte(protocol >> 8, &offset));
send_off = ppp_send_bytes(ppp, (uint8_t *)&escaped + offset,
offset ? 1 : 2,
send_off);
@@ -868,7 +868,7 @@ static int ppp_send(const struct device *dev, struct net_pkt *pkt)
while (buf) {
for (i = 0; i < buf->len; i++) {
/* Escape illegal bytes */
escaped = htons(ppp_escape_byte(buf->data[i], &offset));
escaped = net_htons(ppp_escape_byte(buf->data[i], &offset));
send_off = ppp_send_bytes(ppp,
(uint8_t *)&escaped + offset,
offset ? 1 : 2,
@@ -878,12 +878,12 @@ static int ppp_send(const struct device *dev, struct net_pkt *pkt)
buf = buf->frags;
}
escaped = htons(ppp_escape_byte(fcs, &offset));
escaped = net_htons(ppp_escape_byte(fcs, &offset));
send_off = ppp_send_bytes(ppp, (uint8_t *)&escaped + offset,
offset ? 1 : 2,
send_off);
escaped = htons(ppp_escape_byte(fcs >> 8, &offset));
escaped = net_htons(ppp_escape_byte(fcs >> 8, &offset));
send_off = ppp_send_bytes(ppp, (uint8_t *)&escaped + offset,
offset ? 1 : 2,
send_off);

4
subsys/mgmt/hawkbit/hawkbit.c
View File

@@ -77,9 +77,9 @@ static bool hawkbit_initialized;
#ifdef CONFIG_DNS_RESOLVER_MAX_QUERY_LEN
#define SERVER_ADDR_LEN CONFIG_DNS_RESOLVER_MAX_QUERY_LEN
#elif defined(CONFIG_NET_IPV6)
#define SERVER_ADDR_LEN INET6_ADDRSTRLEN
#define SERVER_ADDR_LEN NET_INET6_ADDRSTRLEN
#else
#define SERVER_ADDR_LEN INET_ADDRSTRLEN
#define SERVER_ADDR_LEN NET_INET_ADDRSTRLEN
#endif
static struct hawkbit_config {

4
subsys/net/l2/ppp/ipcp.c
View File

@@ -198,7 +198,7 @@ static int ipcp_ip_address_parse(struct ppp_fsm *fsm, struct net_pkt *pkt,
}
#endif
if (CONFIG_NET_L2_PPP_LOG_LEVEL >= LOG_LEVEL_DBG) {
char dst[INET_ADDRSTRLEN];
char dst[NET_INET_ADDRSTRLEN];
char *addr_str;
addr_str = net_addr_ntop(NET_AF_INET, &data->addr, dst,
@@ -433,7 +433,7 @@ static void ipcp_up(struct ppp_fsm *fsm)
struct ppp_context *ctx = CONTAINER_OF(fsm, struct ppp_context,
ipcp.fsm);
struct net_if_addr *addr;
char dst[INET_ADDRSTRLEN];
char dst[NET_INET_ADDRSTRLEN];
char *addr_str;
if (ctx->is_ipcp_up) {

4
subsys/net/l2/ppp/ipv6cp.c
View File

@@ -274,7 +274,7 @@ static void ipv6cp_up(struct ppp_fsm *fsm)
} else {
if (CONFIG_NET_L2_PPP_LOG_LEVEL >= LOG_LEVEL_DBG) {
uint8_t iid_str[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
char dst[INET6_ADDRSTRLEN];
char dst[NET_INET6_ADDRSTRLEN];
char *addr_str;
net_sprint_ll_addr_buf(peer_lladdr.addr,
@@ -327,7 +327,7 @@ static void ipv6cp_down(struct ppp_fsm *fsm)
} else {
if (CONFIG_NET_L2_PPP_LOG_LEVEL >= LOG_LEVEL_DBG) {
uint8_t iid_str[sizeof("xx:xx:xx:xx:xx:xx:xx:xx")];
char dst[INET6_ADDRSTRLEN];
char dst[NET_INET6_ADDRSTRLEN];
char *addr_str;
net_sprint_ll_addr_buf(ctx->ipv6cp.peer_options.iid,

4
subsys/net/lib/dhcpv4/dhcpv4_server.c
View File

@@ -1550,7 +1550,7 @@ int net_dhcpv4_server_start(struct net_if *iface, struct net_in_addr *base_addr)
.sin_addr = NET_INADDR_ANY_INIT,
.sin_port = net_htons(DHCPV4_SERVER_PORT),
};
struct ifreq ifreq = { 0 };
struct net_ifreq ifreq = { 0 };
int ret, sock = -1, slot = -1;
const struct net_in_addr *server_addr;
struct net_in_addr netmask;
@@ -1618,7 +1618,7 @@ int net_dhcpv4_server_start(struct net_if *iface, struct net_in_addr *base_addr)
goto error;
}
ret = zsock_setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, &ifreq,
ret = zsock_setsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, &ifreq,
sizeof(ifreq));
if (ret < 0) {
ret = -errno;

2
subsys/net/lib/midi2/netmidi2.c
View File

@@ -69,7 +69,7 @@ NET_BUF_POOL_DEFINE(netmidi2_pool, 2 + CONFIG_NETMIDI2_HOST_MAX_CLIENTS,
do { \
const struct net_sockaddr *addr = net_sad(&(_s)->addr); \
const struct net_sockaddr_in6 *addr6 = net_sin6(addr); \
char __pn[INET6_ADDRSTRLEN]; \
char __pn[NET_INET6_ADDRSTRLEN]; \
net_addr_ntop(addr->sa_family, &addr6->sin6_addr, __pn, sizeof(__pn)); \
NET_##_lvl("%s:%d " _fmt, __pn, addr6->sin6_port, ##__VA_ARGS__); \
} while (0)

4
subsys/net/lib/sockets/sockets_net_mgmt.c
View File

@@ -198,7 +198,7 @@ again:
}
nm_addr->nm_pid = mgmt->pid;
nm_addr->nm_family = AF_NET_MGMT;
nm_addr->nm_family = NET_AF_NET_MGMT;
nm_addr->nm_mask = raised_event;
}
@@ -394,5 +394,5 @@ static bool net_mgmt_is_supported(int family, int type, int proto)
return true;
}
NET_SOCKET_REGISTER(af_net_mgmt, NET_SOCKET_DEFAULT_PRIO, AF_NET_MGMT,
NET_SOCKET_REGISTER(af_net_mgmt, NET_SOCKET_DEFAULT_PRIO, NET_AF_NET_MGMT,
net_mgmt_is_supported, znet_mgmt_socket);

2
subsys/tracing/ctf/ctf_top.h
View File

@@ -18,7 +18,7 @@
/* Increase the string length to be able to store IPv4/6 address */
#if defined(CONFIG_NET_IPV6)
#define CTF_NET_MAX_STRING_LEN INET6_ADDRSTRLEN
#define CTF_NET_MAX_STRING_LEN NET_INET6_ADDRSTRLEN
#else
#define CTF_NET_MAX_STRING_LEN CTF_MAX_STRING_LEN
#endif

2
tests/net/ip-addr/src/main.c
View File

@@ -252,7 +252,7 @@ static const char *get_addr_state(struct net_if *iface,
ZTEST(ip_addr_fn, test_ipv6_addresses)
{
struct net_in6_addr loopback = IN6ADDR_LOOPBACK_INIT;
struct net_in6_addr loopback = NET_IN6ADDR_LOOPBACK_INIT;
struct net_in6_addr any = NET_IN6ADDR_ANY_INIT;
struct net_in6_addr mcast = { { { 0xff, 0x84, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0x2 } } };

4
tests/net/lib/dns_resolve/src/main.c
View File

@@ -871,7 +871,7 @@ ZTEST(dns_resolve, test_dns_localhost_resolve_ipv4)
{
Z_TEST_SKIP_IFNDEF(CONFIG_NET_IPV4);
struct net_in_addr addr = INADDR_LOOPBACK_INIT;
struct net_in_addr addr = NET_INADDR_LOOPBACK_INIT;
struct zsock_addrinfo hints = { 0 };
struct zsock_addrinfo *addrinfos;
const char *hostname = "localhost";
@@ -892,7 +892,7 @@ ZTEST(dns_resolve, test_dns_localhost_resolve_ipv6)
{
Z_TEST_SKIP_IFNDEF(CONFIG_NET_IPV6);
struct net_in6_addr addr = IN6ADDR_LOOPBACK_INIT;
struct net_in6_addr addr = NET_IN6ADDR_LOOPBACK_INIT;
struct zsock_addrinfo hints = { 0 };
struct zsock_addrinfo *addrinfos;
const char *hostname = "localhost";

2
tests/net/lib/mqtt/v3_1_1/mqtt_client/src/main.c
View File

@@ -129,7 +129,7 @@ static void broker_init(void)
printk("Failed to create server socket\n");
}
ret = zsock_setsockopt(s_sock, SOL_SOCKET, SO_REUSEADDR, &reuseaddr,
ret = zsock_setsockopt(s_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEADDR, &reuseaddr,
sizeof(reuseaddr));
if (ret < 0) {
printk("Failed to set SO_REUSEADDR on server socket, %d\n", errno);

4
tests/net/socket/af_packet/src/main.c
View File

@@ -195,7 +195,7 @@ static void setup_packet_socket(int *sock, int type, int proto)
*sock = zsock_socket(NET_AF_PACKET, type, proto);
zassert_true(*sock >= 0, "Cannot create packet socket (%d)", -errno);
ret = zsock_setsockopt(*sock, SOL_SOCKET, SO_RCVTIMEO, &optval,
ret = zsock_setsockopt(*sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval,
sizeof(optval));
zassert_ok(ret, "setsockopt failed (%d)", errno);
}
@@ -270,7 +270,7 @@ static void prepare_udp_socket(int *sock, struct net_sockaddr_in *sockaddr, uint
ret = zsock_bind(*sock, (struct net_sockaddr *) sockaddr, sizeof(*sockaddr));
zassert_equal(ret, 0, "Cannot bind DGRAM (UDP) socket (%d)", -errno);
ret = zsock_setsockopt(*sock, SOL_SOCKET, SO_RCVTIMEO, &optval,
ret = zsock_setsockopt(*sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval,
sizeof(optval));
zassert_ok(ret, "setsockopt failed (%d)", errno);
}

8
tests/net/socket/getaddrinfo/src/main.c
View File

@@ -175,7 +175,7 @@ K_THREAD_DEFINE(dns_server_thread_id, STACK_SIZE,
static void *test_getaddrinfo_setup(void)
{
char str[INET6_ADDRSTRLEN], *addr_str;
char str[NET_INET6_ADDRSTRLEN], *addr_str;
struct net_sockaddr addr;
int ret;
@@ -545,7 +545,7 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_flags_numerichost)
int ret;
struct zsock_addrinfo *res = NULL;
struct zsock_addrinfo hints = {
.ai_flags = AI_NUMERICHOST,
.ai_flags = ZSOCK_AI_NUMERICHOST,
};
ret = zsock_getaddrinfo("foo.bar", "65534", &hints, &res);
@@ -605,7 +605,7 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_null_host)
struct zsock_addrinfo hints = {
.ai_family = NET_AF_INET,
.ai_socktype = NET_SOCK_STREAM,
.ai_flags = AI_PASSIVE
.ai_flags = ZSOCK_AI_PASSIVE
};
int ret;
@@ -635,7 +635,7 @@ ZTEST(net_socket_getaddrinfo, test_getaddrinfo_null_host)
saddr6 = net_sin6(res->ai_addr);
zassert_equal(saddr6->sin6_family, NET_AF_INET6, "");
zassert_equal(saddr6->sin6_port, net_htons(80), "");
zassert_equal(0, memcmp(&saddr6->sin6_addr, &in6addr_any, sizeof(in6addr_any)), "");
zassert_equal(0, memcmp(&saddr6->sin6_addr, &net_in6addr_any, sizeof(net_in6addr_any)), "");
zsock_freeaddrinfo(res);
/* Test IPv6 UDP */

6
tests/net/socket/net_mgmt/src/main.c
View File

@@ -363,7 +363,7 @@ static void test_net_mgmt_setup(void)
net_if_foreach(iface_cb, &default_iface);
zassert_not_null(default_iface, "Cannot find test interface");
fd = zsock_socket(AF_NET_MGMT, NET_SOCK_DGRAM, NET_MGMT_EVENT_PROTO);
fd = zsock_socket(NET_AF_NET_MGMT, NET_SOCK_DGRAM, NET_MGMT_EVENT_PROTO);
zassert_false(fd < 0, "Cannot create net_mgmt socket (%d)", errno);
#ifdef CONFIG_USERSPACE
@@ -378,7 +378,7 @@ static void test_net_mgmt_setup(void)
memset(&sockaddr, 0, sizeof(sockaddr));
sockaddr.nm_family = AF_NET_MGMT;
sockaddr.nm_family = NET_AF_NET_MGMT;
sockaddr.nm_ifindex = net_if_get_by_iface(default_iface);
sockaddr.nm_pid = (uintptr_t)k_current_get();
sockaddr.nm_mask = NET_EVENT_IPV6_DAD_SUCCEED |
@@ -395,7 +395,7 @@ static void test_net_mgmt_catch_events(void)
{
struct net_sockaddr_nm event_addr;
net_socklen_t event_addr_len;
char ipaddr[INET6_ADDRSTRLEN];
char ipaddr[NET_INET6_ADDRSTRLEN];
uint8_t buf[MAX_BUF_LEN];
int event_count = 2;
int ret;

24
tests/net/socket/offload_dispatcher/src/main.c
View File

@@ -606,7 +606,7 @@ ZTEST(net_socket_offload_udp, test_getsockopt_not_bound)
struct timeval optval = { 0 };
net_socklen_t optlen = sizeof(optval);
ret = zsock_getsockopt(test_sock, SOL_SOCKET, SO_RCVTIMEO,
ret = zsock_getsockopt(test_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO,
&optval, &optlen);
zassert_equal(0, ret, "getsockopt() failed");
zassert_true(test_socket_ctx[OFFLOAD_1].socket_called,
@@ -623,7 +623,7 @@ ZTEST(net_socket_offload_udp, test_setsockopt_not_bound)
int ret;
struct timeval optval = { 0 };
ret = zsock_setsockopt(test_sock, SOL_SOCKET, SO_RCVTIMEO,
ret = zsock_setsockopt(test_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO,
&optval, sizeof(optval));
zassert_equal(0, ret, "setsockopt() failed");
zassert_true(test_socket_ctx[OFFLOAD_1].socket_called,
@@ -689,7 +689,7 @@ ZTEST(net_socket_offload_udp, test_so_bindtodevice_iface_offloaded)
{
int ret;
uint8_t dummy_data = 0;
struct ifreq ifreq = {
struct net_ifreq ifreq = {
#if defined(CONFIG_NET_INTERFACE_NAME)
.ifr_name = "net1"
#else
@@ -700,7 +700,7 @@ ZTEST(net_socket_offload_udp, test_so_bindtodevice_iface_offloaded)
.sin_family = NET_AF_INET
};
ret = zsock_setsockopt(test_sock, SOL_SOCKET, SO_BINDTODEVICE,
ret = zsock_setsockopt(test_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE,
&ifreq, sizeof(ifreq));
zassert_equal(0, ret, "setsockopt() failed");
zassert_false(test_socket_ctx[OFFLOAD_1].socket_called,
@@ -724,7 +724,7 @@ ZTEST(net_socket_offload_udp, test_so_bindtodevice_iface_native)
{
int ret;
uint8_t dummy_data = 0;
struct ifreq ifreq = {
struct net_ifreq ifreq = {
#if defined(CONFIG_NET_INTERFACE_NAME)
.ifr_name = "dummy0"
#else
@@ -733,7 +733,7 @@ ZTEST(net_socket_offload_udp, test_so_bindtodevice_iface_native)
};
struct net_sockaddr_in addr = test_peer_addr;
ret = zsock_setsockopt(test_sock, SOL_SOCKET, SO_BINDTODEVICE,
ret = zsock_setsockopt(test_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE,
&ifreq, sizeof(ifreq));
zassert_equal(0, ret, "setsockopt() failed");
@@ -759,7 +759,7 @@ ZTEST(net_socket_offload_tls, test_tls_native_iface_offloaded)
int ret;
const struct fd_op_vtable *vtable;
void *obj;
struct ifreq ifreq = {
struct net_ifreq ifreq = {
#if defined(CONFIG_NET_INTERFACE_NAME)
.ifr_name = "net1"
#else
@@ -769,7 +769,7 @@ ZTEST(net_socket_offload_tls, test_tls_native_iface_offloaded)
int tls_native = 1;
struct net_sockaddr_in addr = test_peer_addr;
ret = zsock_setsockopt(test_sock, SOL_TLS, TLS_NATIVE,
ret = zsock_setsockopt(test_sock, ZSOCK_SOL_TLS, ZSOCK_TLS_NATIVE,
&tls_native, sizeof(tls_native));
zassert_equal(0, ret, "setsockopt() failed");
zassert_false(test_socket_ctx[OFFLOAD_1].socket_called,
@@ -781,7 +781,7 @@ ZTEST(net_socket_offload_tls, test_tls_native_iface_offloaded)
zassert_not_null(obj, "No obj found");
zassert_true(net_socket_is_tls(obj), "Socket is not a native TLS sock");
ret = zsock_setsockopt(test_sock, SOL_SOCKET, SO_BINDTODEVICE,
ret = zsock_setsockopt(test_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE,
&ifreq, sizeof(ifreq));
zassert_equal(0, ret, "setsockopt() failed");
zassert_false(test_socket_ctx[OFFLOAD_1].socket_called,
@@ -806,7 +806,7 @@ ZTEST(net_socket_offload_tls, test_tls_native_iface_native)
int ret;
const struct fd_op_vtable *vtable;
void *obj;
struct ifreq ifreq = {
struct net_ifreq ifreq = {
#if defined(CONFIG_NET_INTERFACE_NAME)
.ifr_name = "dummy0"
#else
@@ -816,7 +816,7 @@ ZTEST(net_socket_offload_tls, test_tls_native_iface_native)
int tls_native = 1;
struct net_sockaddr_in addr = test_peer_addr;
ret = zsock_setsockopt(test_sock, SOL_TLS, TLS_NATIVE,
ret = zsock_setsockopt(test_sock, ZSOCK_SOL_TLS, ZSOCK_TLS_NATIVE,
&tls_native, sizeof(tls_native));
zassert_equal(0, ret, "setsockopt() failed");
zassert_false(test_socket_ctx[OFFLOAD_1].socket_called,
@@ -828,7 +828,7 @@ ZTEST(net_socket_offload_tls, test_tls_native_iface_native)
zassert_not_null(obj, "No obj found");
zassert_true(net_socket_is_tls(obj), "Socket is not a native TLS sock");
ret = zsock_setsockopt(test_sock, SOL_SOCKET, SO_BINDTODEVICE,
ret = zsock_setsockopt(test_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE,
&ifreq, sizeof(ifreq));
zassert_equal(0, ret, "setsockopt() failed");
zassert_false(test_socket_ctx[OFFLOAD_1].socket_called,

8
tests/net/socket/reuseaddr_reuseport/src/main.c
View File

@@ -107,7 +107,7 @@ static void test_getsocketopt_reuseaddr(int sock, void *optval, net_socklen_t *o
{
int ret;
ret = zsock_getsockopt(sock, SOL_SOCKET, SO_REUSEADDR, optval, optlen);
ret = zsock_getsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEADDR, optval, optlen);
zassert_equal(ret, 0, "getsocketopt() failed with error %d", errno);
}
@@ -115,7 +115,7 @@ static void test_setsocketopt_reuseaddr(int sock, void *optval, net_socklen_t op
{
int ret;
ret = zsock_setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, optval, optlen);
ret = zsock_setsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEADDR, optval, optlen);
zassert_equal(ret, 0, "setsocketopt() failed with error %d", errno);
}
@@ -130,7 +130,7 @@ static void test_getsocketopt_reuseport(int sock, void *optval, net_socklen_t *o
{
int ret;
ret = zsock_getsockopt(sock, SOL_SOCKET, SO_REUSEPORT, optval, optlen);
ret = zsock_getsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEPORT, optval, optlen);
zassert_equal(ret, 0, "getsocketopt() failed with error %d", errno);
}
@@ -138,7 +138,7 @@ static void test_setsocketopt_reuseport(int sock, void *optval, net_socklen_t op
{
int ret;
ret = zsock_setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, optval, optlen);
ret = zsock_setsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_REUSEPORT, optval, optlen);
zassert_equal(ret, 0, "setsocketopt() failed with error %d", errno);
}

68
tests/net/socket/tcp/src/main.c
View File

@@ -527,7 +527,7 @@ ZTEST(net_socket_tcp, test_v4_broken_link)
test_accept(s_sock, &new_sock, &addr, &addrlen);
zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen");
rv = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVTIMEO, &optval,
rv = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval,
sizeof(optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", errno);
@@ -1288,12 +1288,12 @@ ZTEST(net_socket_tcp, test_so_type)
prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &sock1, &bind_addr4);
prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &sock2, &bind_addr6);
rv = zsock_getsockopt(sock1, SOL_SOCKET, SO_TYPE, &optval, &optlen);
rv = zsock_getsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_TYPE, &optval, &optlen);
zassert_equal(rv, 0, "getsockopt failed (%d)", errno);
zassert_equal(optval, NET_SOCK_STREAM, "getsockopt got invalid type");
zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");
rv = zsock_getsockopt(sock2, SOL_SOCKET, SO_TYPE, &optval, &optlen);
rv = zsock_getsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_TYPE, &optval, &optlen);
zassert_equal(rv, 0, "getsockopt failed (%d)", errno);
zassert_equal(optval, NET_SOCK_STREAM, "getsockopt got invalid type");
zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");
@@ -1317,12 +1317,12 @@ ZTEST(net_socket_tcp, test_so_protocol)
prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &sock1, &bind_addr4);
prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &sock2, &bind_addr6);
rv = zsock_getsockopt(sock1, SOL_SOCKET, SO_PROTOCOL, &optval, &optlen);
rv = zsock_getsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_PROTOCOL, &optval, &optlen);
zassert_equal(rv, 0, "getsockopt failed (%d)", errno);
zassert_equal(optval, NET_IPPROTO_TCP, "getsockopt got invalid protocol");
zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");
rv = zsock_getsockopt(sock2, SOL_SOCKET, SO_PROTOCOL, &optval, &optlen);
rv = zsock_getsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_PROTOCOL, &optval, &optlen);
zassert_equal(rv, 0, "getsockopt failed (%d)", errno);
zassert_equal(optval, NET_IPPROTO_TCP, "getsockopt got invalid protocol");
zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");
@@ -1345,26 +1345,26 @@ ZTEST(net_socket_tcp, test_so_rcvbuf)
prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &sock1, &bind_addr4);
prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &sock2, &bind_addr6);
rv = zsock_setsockopt(sock1, SOL_SOCKET, SO_RCVBUF, &optval, sizeof(optval));
rv = zsock_setsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &optval, sizeof(optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", rv);
rv = zsock_getsockopt(sock1, SOL_SOCKET, SO_RCVBUF, &retval, &optlen);
rv = zsock_getsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &retval, &optlen);
zassert_equal(rv, 0, "getsockopt failed (%d)", rv);
zassert_equal(retval, optval, "getsockopt got invalid rcvbuf");
zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");
rv = zsock_setsockopt(sock2, SOL_SOCKET, SO_RCVBUF, &optval, sizeof(optval));
rv = zsock_setsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &optval, sizeof(optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", rv);
rv = zsock_getsockopt(sock2, SOL_SOCKET, SO_RCVBUF, &retval, &optlen);
rv = zsock_getsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &retval, &optlen);
zassert_equal(rv, 0, "getsockopt failed (%d)", rv);
zassert_equal(retval, optval, "getsockopt got invalid rcvbuf");
zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");
optval = -1;
rv = zsock_setsockopt(sock2, SOL_SOCKET, SO_RCVBUF, &optval, sizeof(optval));
rv = zsock_setsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &optval, sizeof(optval));
zassert_equal(rv, -1, "setsockopt failed (%d)", rv);
optval = UINT16_MAX + 1;
rv = zsock_setsockopt(sock2, SOL_SOCKET, SO_RCVBUF, &optval, sizeof(optval));
rv = zsock_setsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &optval, sizeof(optval));
zassert_equal(rv, -1, "setsockopt failed (%d)", rv);
test_close(sock1);
@@ -1398,7 +1398,7 @@ ZTEST(net_socket_tcp, test_so_rcvbuf_win_size)
zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen");
/* Lower server-side RX window size. */
rv = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVBUF, &buf_optval,
rv = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &buf_optval,
sizeof(buf_optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", errno);
@@ -1434,26 +1434,26 @@ ZTEST(net_socket_tcp, test_so_sndbuf)
prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &sock1, &bind_addr4);
prepare_sock_tcp_v6(MY_IPV6_ADDR, ANY_PORT, &sock2, &bind_addr6);
rv = zsock_setsockopt(sock1, SOL_SOCKET, SO_SNDBUF, &optval, sizeof(optval));
rv = zsock_setsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_SNDBUF, &optval, sizeof(optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", rv);
rv = zsock_getsockopt(sock1, SOL_SOCKET, SO_SNDBUF, &retval, &optlen);
rv = zsock_getsockopt(sock1, ZSOCK_SOL_SOCKET, ZSOCK_SO_SNDBUF, &retval, &optlen);
zassert_equal(rv, 0, "getsockopt failed (%d)", rv);
zassert_equal(retval, optval, "getsockopt got invalid rcvbuf");
zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");
rv = zsock_setsockopt(sock2, SOL_SOCKET, SO_SNDBUF, &optval, sizeof(optval));
rv = zsock_setsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_SNDBUF, &optval, sizeof(optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", rv);
rv = zsock_getsockopt(sock2, SOL_SOCKET, SO_SNDBUF, &retval, &optlen);
rv = zsock_getsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_SNDBUF, &retval, &optlen);
zassert_equal(rv, 0, "getsockopt failed (%d)", rv);
zassert_equal(retval, optval, "getsockopt got invalid rcvbuf");
zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");
optval = -1;
rv = zsock_setsockopt(sock2, SOL_SOCKET, SO_SNDBUF, &optval, sizeof(optval));
rv = zsock_setsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_SNDBUF, &optval, sizeof(optval));
zassert_equal(rv, -1, "setsockopt failed (%d)", rv);
optval = UINT16_MAX + 1;
rv = zsock_setsockopt(sock2, SOL_SOCKET, SO_RCVBUF, &optval, sizeof(optval));
rv = zsock_setsockopt(sock2, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &optval, sizeof(optval));
zassert_equal(rv, -1, "setsockopt failed (%d)", rv);
test_close(sock1);
@@ -1479,7 +1479,7 @@ ZTEST(net_socket_tcp, test_so_sndbuf_win_size)
prepare_sock_tcp_v4(MY_IPV4_ADDR, SERVER_PORT, &s_sock, &s_saddr);
/* Lower client-side TX window size. */
rv = zsock_setsockopt(c_sock, SOL_SOCKET, SO_SNDBUF, &buf_optval,
rv = zsock_setsockopt(c_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_SNDBUF, &buf_optval,
sizeof(buf_optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", errno);
@@ -1542,12 +1542,12 @@ ZTEST(net_socket_tcp, test_v4_so_rcvtimeo)
test_accept(s_sock, &new_sock, &addr, &addrlen);
zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen");
rv = zsock_setsockopt(c_sock, SOL_SOCKET, SO_RCVTIMEO, &optval,
rv = zsock_setsockopt(c_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval,
sizeof(optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", errno);
optval.tv_usec = 0;
rv = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVTIMEO, &optval,
rv = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval,
sizeof(optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", errno);
@@ -1609,12 +1609,12 @@ ZTEST(net_socket_tcp, test_v6_so_rcvtimeo)
test_accept(s_sock, &new_sock, &addr, &addrlen);
zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "wrong addrlen");
rv = zsock_setsockopt(c_sock, SOL_SOCKET, SO_RCVTIMEO, &optval,
rv = zsock_setsockopt(c_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval,
sizeof(optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", errno);
optval.tv_usec = 0;
rv = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVTIMEO, &optval,
rv = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &optval,
sizeof(optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", errno);
@@ -1674,12 +1674,12 @@ ZTEST(net_socket_tcp, test_v4_so_sndtimeo)
test_accept(s_sock, &new_sock, &addr, &addrlen);
zassert_equal(addrlen, sizeof(struct net_sockaddr_in), "wrong addrlen");
rv = zsock_setsockopt(c_sock, SOL_SOCKET, SO_SNDTIMEO, &timeo_optval,
rv = zsock_setsockopt(c_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_SNDTIMEO, &timeo_optval,
sizeof(timeo_optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", errno);
/* Simulate window full scenario with SO_RCVBUF option. */
rv = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVBUF, &buf_optval,
rv = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &buf_optval,
sizeof(buf_optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", errno);
@@ -1735,12 +1735,12 @@ ZTEST(net_socket_tcp, test_v6_so_sndtimeo)
test_accept(s_sock, &new_sock, &addr, &addrlen);
zassert_equal(addrlen, sizeof(struct net_sockaddr_in6), "wrong addrlen");
rv = zsock_setsockopt(c_sock, SOL_SOCKET, SO_SNDTIMEO, &timeo_optval,
rv = zsock_setsockopt(c_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_SNDTIMEO, &timeo_optval,
sizeof(timeo_optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", errno);
/* Simulate window full scenario with SO_RCVBUF option. */
rv = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVBUF, &buf_optval,
rv = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVBUF, &buf_optval,
sizeof(buf_optval));
zassert_equal(rv, 0, "setsockopt failed (%d)", errno);
@@ -1839,7 +1839,7 @@ ZTEST(net_socket_tcp, test_v4_msg_waitall)
/* MSG_WAITALL + SO_RCVTIMEO - make sure recv returns the amount of data
* received so far
*/
ret = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVTIMEO, &timeo_optval,
ret = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &timeo_optval,
sizeof(timeo_optval));
zassert_equal(ret, 0, "setsockopt failed (%d)", errno);
@@ -1916,7 +1916,7 @@ ZTEST(net_socket_tcp, test_v6_msg_waitall)
/* MSG_WAITALL + SO_RCVTIMEO - make sure recv returns the amount of data
* received so far
*/
ret = zsock_setsockopt(new_sock, SOL_SOCKET, SO_RCVTIMEO, &timeo_optval,
ret = zsock_setsockopt(new_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_RCVTIMEO, &timeo_optval,
sizeof(timeo_optval));
zassert_equal(ret, 0, "setsockopt failed (%d)", errno);
@@ -2272,7 +2272,7 @@ ZTEST(net_socket_tcp, test_connect_and_wait_for_v4_select)
zassert_true(ret > 0, "select failed, %d", errno);
/* Get the reason for the connect */
ret = zsock_getsockopt(fd, SOL_SOCKET, SO_ERROR, &optval, &optlen);
ret = zsock_getsockopt(fd, ZSOCK_SOL_SOCKET, ZSOCK_SO_ERROR, &optval, &optlen);
zassert_equal(ret, 0, "getsockopt failed, %d", errno);
/* If SO_ERROR is 0, then it means that connect succeed. Any
@@ -2337,7 +2337,7 @@ ZTEST(net_socket_tcp, test_connect_and_wait_for_v4_poll)
zassert_true(closed, "poll failed, %d", errno);
/* Get the reason for the connect */
ret = zsock_getsockopt(fd, SOL_SOCKET, SO_ERROR, &optval, &optlen);
ret = zsock_getsockopt(fd, ZSOCK_SOL_SOCKET, ZSOCK_SO_ERROR, &optval, &optlen);
zassert_equal(ret, 0, "getsockopt failed, %d", errno);
/* If SO_ERROR is 0, then it means that connect succeed. Any
@@ -2359,18 +2359,18 @@ ZTEST(net_socket_tcp, test_so_keepalive_opt)
prepare_sock_tcp_v4(MY_IPV4_ADDR, ANY_PORT, &sock, &bind_addr4);
/* Keep-alive should be disabled by default. */
ret = zsock_getsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &optval, &optlen);
ret = zsock_getsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_KEEPALIVE, &optval, &optlen);
zassert_equal(ret, 0, "getsockopt failed (%d)", errno);
zassert_equal(optval, 0, "getsockopt got invalid value");
zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");
/* Enable keep-alive. */
optval = 1;
ret = zsock_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE,
ret = zsock_setsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_KEEPALIVE,
&optval, sizeof(optval));
zassert_equal(ret, 0, "setsockopt failed (%d)", errno);
ret = zsock_getsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, &optval, &optlen);
ret = zsock_getsockopt(sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_KEEPALIVE, &optval, &optlen);
zassert_equal(ret, 0, "getsockopt failed (%d)", errno);
zassert_equal(optval, 1, "getsockopt got invalid value");
zassert_equal(optlen, sizeof(optval), "getsockopt got invalid size");

62
tests/net/socket/udp/src/main.c
View File

@@ -2942,25 +2942,25 @@ static void check_port_range(struct net_sockaddr *my_addr,
zassert_true(sock >= 0, "Cannot create socket (%d)", -errno);
optval = PORT_RANGE(1024, 1500);
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE,
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_LOCAL_PORT_RANGE,
&optval, sizeof(optval));
err = -errno;
zexpect_equal(ret, 0, "setsockopt failed (%d)", err);
optval = 0; optlen = 0U;
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE,
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_LOCAL_PORT_RANGE,
&optval, optlen);
err = -errno;
zexpect_equal(ret, -1, "setsockopt failed (%d)", err);
optval = 0; optlen = sizeof(uint64_t);
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE,
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_LOCAL_PORT_RANGE,
&optval, optlen);
err = -errno;
zexpect_equal(ret, -1, "setsockopt failed (%d)", err);
optval = PORT_RANGE(0, 0);
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE,
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_LOCAL_PORT_RANGE,
&optval, sizeof(optval));
zexpect_equal(ret, 0, "setsockopt failed (%d)", err);
@@ -2968,23 +2968,23 @@ static void check_port_range(struct net_sockaddr *my_addr,
* then taken into use when we bind the socket.
*/
optval = PORT_RANGE(1024, 0);
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE,
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_LOCAL_PORT_RANGE,
&optval, sizeof(optval));
zexpect_equal(ret, 0, "setsockopt failed (%d)", err);
optval = PORT_RANGE(0, 1024);
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE,
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_LOCAL_PORT_RANGE,
&optval, sizeof(optval));
zexpect_equal(ret, 0, "setsockopt failed (%d)", err);
/* Then set a valid range and verify that bound socket is using it */
optval = PORT_RANGE(10000, 10010);
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE,
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_LOCAL_PORT_RANGE,
&optval, sizeof(optval));
zexpect_equal(ret, 0, "setsockopt failed (%d)", err);
optval = 0; optlen = sizeof(optval);
ret = zsock_getsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE,
ret = zsock_getsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_LOCAL_PORT_RANGE,
&optval, &optlen);
zexpect_equal(ret, 0, "setsockopt failed (%d)", err);
zexpect_equal(optval, PORT_RANGE(10000, 10010), "Invalid port range");
@@ -3011,7 +3011,7 @@ static void check_port_range(struct net_sockaddr *my_addr,
zassert_true(sock >= 0, "Cannot create socket (%d)", -errno);
optval = PORT_RANGE(1001, 1000);
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE,
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_LOCAL_PORT_RANGE,
&optval, sizeof(optval));
err = -errno;
zexpect_equal(ret, -1, "setsockopt failed (%d)", err);
@@ -3019,14 +3019,14 @@ static void check_port_range(struct net_sockaddr *my_addr,
/* Port range cannot be just one port */
optval = PORT_RANGE(1001, 1001);
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE,
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_LOCAL_PORT_RANGE,
&optval, sizeof(optval));
err = -errno;
zexpect_equal(ret, -1, "setsockopt failed (%d)", err);
zexpect_equal(err, -EINVAL, "Invalid errno (%d)", -err);
optval = PORT_RANGE(0, 1000);
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, IP_LOCAL_PORT_RANGE,
ret = zsock_setsockopt(sock, NET_IPPROTO_IP, ZSOCK_IP_LOCAL_PORT_RANGE,
&optval, sizeof(optval));
err = -errno;
zexpect_equal(ret, 0, "setsockopt failed (%d)", err);
@@ -3060,7 +3060,7 @@ ZTEST(net_socket_udp, test_clamp_udp_tcp_port_range)
struct net_sockaddr_in6 my_addr6 = {
.sin6_family = NET_AF_INET6,
.sin6_port = 0,
.sin6_addr = in6addr_loopback,
.sin6_addr = net_in6addr_loopback,
};
struct net_sockaddr_in local_addr4;
struct net_sockaddr_in6 local_addr6;
@@ -3675,27 +3675,27 @@ ZTEST(net_socket_udp, test_ipv4_mapped_to_ipv6_sendmsg)
test_ipv4_mapped_to_ipv6_send_common(IPV4_MAPPED_TO_IPV6_SENDMSG);
}
static void test_rebinding_common(sa_family_t family)
static void test_rebinding_common(net_sa_family_t family)
{
int rv;
int client_sock;
int server_sock;
struct sockaddr client_addr;
struct sockaddr server_addr;
socklen_t addrlen;
struct net_sockaddr client_addr;
struct net_sockaddr server_addr;
net_socklen_t addrlen;
if (family == AF_INET) {
if (family == NET_AF_INET) {
prepare_sock_udp_v4(MY_IPV4_ADDR, CLIENT_PORT, &client_sock,
(struct sockaddr_in *)&client_addr);
(struct net_sockaddr_in *)&client_addr);
prepare_sock_udp_v4(MY_IPV4_ADDR, SERVER_PORT, &server_sock,
(struct sockaddr_in *)&server_addr);
addrlen = sizeof(struct sockaddr_in);
(struct net_sockaddr_in *)&server_addr);
addrlen = sizeof(struct net_sockaddr_in);
} else {
prepare_sock_udp_v6(MY_IPV6_ADDR, CLIENT_PORT, &client_sock,
(struct sockaddr_in6 *)&client_addr);
(struct net_sockaddr_in6 *)&client_addr);
prepare_sock_udp_v6(MY_IPV6_ADDR, SERVER_PORT, &server_sock,
(struct sockaddr_in6 *)&server_addr);
addrlen = sizeof(struct sockaddr_in6);
(struct net_sockaddr_in6 *)&server_addr);
addrlen = sizeof(struct net_sockaddr_in6);
}
rv = zsock_bind(client_sock, &client_addr, addrlen);
@@ -3709,10 +3709,10 @@ static void test_rebinding_common(sa_family_t family)
server_sock, &server_addr, addrlen);
/* Rebind client socket */
if (family == AF_INET) {
net_sin(&client_addr)->sin_port = htons(CLIENT_PORT + 1);
if (family == NET_AF_INET) {
net_sin(&client_addr)->sin_port = net_htons(CLIENT_PORT + 1);
} else {
net_sin6(&client_addr)->sin6_port = htons(CLIENT_PORT + 1);
net_sin6(&client_addr)->sin6_port = net_htons(CLIENT_PORT + 1);
}
rv = zsock_bind(client_sock, &client_addr, addrlen);
zassert_equal(rv, 0, "rebinding failed");
@@ -3722,10 +3722,10 @@ static void test_rebinding_common(sa_family_t family)
server_sock, &server_addr, addrlen);
/* Rebind server socket */
if (family == AF_INET) {
net_sin(&server_addr)->sin_port = htons(SERVER_PORT + 1);
if (family == NET_AF_INET) {
net_sin(&server_addr)->sin_port = net_htons(SERVER_PORT + 1);
} else {
net_sin6(&server_addr)->sin6_port = htons(SERVER_PORT + 1);
net_sin6(&server_addr)->sin6_port = net_htons(SERVER_PORT + 1);
}
rv = zsock_bind(server_sock, &server_addr, addrlen);
zassert_equal(rv, 0, "rebinding failed");
@@ -3742,12 +3742,12 @@ static void test_rebinding_common(sa_family_t family)
ZTEST(net_socket_udp, test_v4_rebinding)
{
test_rebinding_common(AF_INET);
test_rebinding_common(NET_AF_INET);
}
ZTEST(net_socket_udp, test_v6_rebinding)
{
test_rebinding_common(AF_INET6);
test_rebinding_common(NET_AF_INET6);
}
static void after(void *arg)

4
tests/net/vlan/src/main.c
View File

@@ -992,7 +992,7 @@ ZTEST(net_vlan, test_zz_vlan_embed_ll_hdr)
struct net_sockaddr_in6 dest_addr;
struct net_if_addr *ifaddr;
ssize_t sent = 0;
struct ifreq ifreq = { 0 };
struct net_ifreq ifreq = { 0 };
char ifname[CONFIG_NET_INTERFACE_NAME_LEN];
/* embed ll interface addresses */
@@ -1033,7 +1033,7 @@ ZTEST(net_vlan, test_zz_vlan_embed_ll_hdr)
zassert_true(ret > 0, "cannot get interface name (%d/%s)", ret, strerror(-ret));
strncpy(ifreq.ifr_name, ifname, sizeof(ifreq.ifr_name));
ret = zsock_setsockopt(client_sock, SOL_SOCKET, SO_BINDTODEVICE, &ifreq,
ret = zsock_setsockopt(client_sock, ZSOCK_SOL_SOCKET, ZSOCK_SO_BINDTODEVICE, &ifreq,
sizeof(ifreq));
zassert_equal(ret, 0, "SO_BINDTODEVICE failed, %d", -errno);