michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: zperf: Use zsock_* API instead of POSIX socket API

Browse source 
In order to make the zperf to work regardless of the POSIX configuration
in the system, convert the socket API usage into Zephyr's native
zsock_* API.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos 2022-07-19 16:46:48 +02:00 • committed by Carles Cufí
commit d18cdad2fc
5 changed files with 80 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

46
subsys/net/lib/zperf/zperf_udp_receiver.c
View file

@ -81,10 +81,10 @@ static int zperf_receiver_send_stat(const struct shell *sh,
build_reply(hdr, stat, reply);
ret = sendto(sock, reply, sizeof(reply), 0, addr,
addr->sa_family == AF_INET6 ?
sizeof(struct sockaddr_in6) :
sizeof(struct sockaddr_in));
ret = zsock_sendto(sock, reply, sizeof(reply), 0, addr,
addr->sa_family == AF_INET6 ?
sizeof(struct sockaddr_in6) :
sizeof(struct sockaddr_in));
if (ret < 0) {
shell_fprintf(sh, SHELL_WARNING,
" Cannot send data to peer (%d)", errno);
@ -259,7 +259,7 @@ void udp_receiver_thread(void *ptr1, void *ptr2, void *ptr3)
static uint8_t buf[UDP_RECEIVER_BUF_SIZE];
const struct shell *sh = ptr1;
int port = POINTER_TO_INT(ptr2);
struct pollfd fds[SOCK_ID_MAX] = { 0 };
struct zsock_pollfd fds[SOCK_ID_MAX] = { 0 };
int ret;
for (int i = 0; i < ARRAY_SIZE(fds); i++) {
@ -271,7 +271,8 @@ void udp_receiver_thread(void *ptr1, void *ptr2, void *ptr3)
in4_addr_my = zperf_get_sin();
fds[SOCK_ID_IPV4].fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
fds[SOCK_ID_IPV4].fd = zsock_socket(AF_INET, SOCK_DGRAM,
IPPROTO_UDP);
if (fds[SOCK_ID_IPV4].fd < 0) {
shell_fprintf(sh, SHELL_WARNING,
"Cannot create IPv4 network socket.\n");
@ -305,9 +306,9 @@ void udp_receiver_thread(void *ptr1, void *ptr2, void *ptr3)
in4_addr_my->sin_port = htons(port);
ret = bind(fds[SOCK_ID_IPV4].fd,
(struct sockaddr *)in4_addr_my,
sizeof(struct sockaddr_in));
ret = zsock_bind(fds[SOCK_ID_IPV4].fd,
(struct sockaddr *)in4_addr_my,
sizeof(struct sockaddr_in));
if (ret < 0) {
shell_fprintf(sh, SHELL_WARNING,
"Cannot bind IPv4 UDP port %d (%d)\n",
@ -316,7 +317,7 @@ void udp_receiver_thread(void *ptr1, void *ptr2, void *ptr3)
goto cleanup;
}
fds[SOCK_ID_IPV4].events = POLLIN;
fds[SOCK_ID_IPV4].events = ZSOCK_POLLIN;
}
if (IS_ENABLED(CONFIG_NET_IPV6)) {
@ -324,7 +325,8 @@ void udp_receiver_thread(void *ptr1, void *ptr2, void *ptr3)
in6_addr_my = zperf_get_sin6();
fds[SOCK_ID_IPV6].fd = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
fds[SOCK_ID_IPV6].fd = zsock_socket(AF_INET6, SOCK_DGRAM,
IPPROTO_UDP);
if (fds[SOCK_ID_IPV6].fd < 0) {
shell_fprintf(sh, SHELL_WARNING,
"Cannot create IPv4 network socket.\n");
@ -359,9 +361,9 @@ void udp_receiver_thread(void *ptr1, void *ptr2, void *ptr3)
in6_addr_my->sin6_port = htons(port);
ret = bind(fds[SOCK_ID_IPV6].fd,
(struct sockaddr *)in6_addr_my,
sizeof(struct sockaddr_in6));
ret = zsock_bind(fds[SOCK_ID_IPV6].fd,
(struct sockaddr *)in6_addr_my,
sizeof(struct sockaddr_in6));
if (ret < 0) {
shell_fprintf(sh, SHELL_WARNING,
"Cannot bind IPv6 UDP port %d (%d)\n",
@ -370,14 +372,14 @@ void udp_receiver_thread(void *ptr1, void *ptr2, void *ptr3)
goto cleanup;
}
fds[SOCK_ID_IPV6].events = POLLIN;
fds[SOCK_ID_IPV6].events = ZSOCK_POLLIN;
}
shell_fprintf(sh, SHELL_NORMAL,
"Listening on port %d\n", port);
while (true) {
ret = poll(fds, ARRAY_SIZE(fds), -1);
ret = zsock_poll(fds, ARRAY_SIZE(fds), -1);
if (ret < 0) {
shell_fprintf(sh, SHELL_WARNING,
"UDP receiver poll error (%d)\n",
@ -389,8 +391,8 @@ void udp_receiver_thread(void *ptr1, void *ptr2, void *ptr3)
struct sockaddr addr;
socklen_t addrlen = sizeof(addr);
if ((fds[i].revents & POLLERR) ||
(fds[i].revents & POLLNVAL)) {
if ((fds[i].revents & ZSOCK_POLLERR) ||
(fds[i].revents & ZSOCK_POLLNVAL)) {
shell_fprintf(
sh, SHELL_WARNING,
"UDP receiver IPv%d socket error\n",
@ -398,12 +400,12 @@ void udp_receiver_thread(void *ptr1, void *ptr2, void *ptr3)
goto cleanup;
}
if (!(fds[i].revents & POLLIN)) {
if (!(fds[i].revents & ZSOCK_POLLIN)) {
continue;
}
ret = recvfrom(fds[i].fd, buf, sizeof(buf), 0, &addr,
&addrlen);
ret = zsock_recvfrom(fds[i].fd, buf, sizeof(buf), 0,
&addr, &addrlen);
if (ret < 0) {
shell_fprintf(
sh, SHELL_WARNING,
@ -419,7 +421,7 @@ void udp_receiver_thread(void *ptr1, void *ptr2, void *ptr3)
cleanup:
for (int i = 0; i < ARRAY_SIZE(fds); i++) {
if (fds[i].fd >= 0) {
close(fds[i].fd);
zsock_close(fds[i].fd);
}
}
}