Skip to content
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

sys/posix/socket: implement MSG_PEEK for recvfrom #16850

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
+691 −108
Open

sys/posix/socket: implement MSG_PEEK for recvfrom #16850

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a8f07c5
pkg/lwip: add peek to sock_ip
HendrikVE Dec 27, 2021
60baa39
pkg/lwip: add peek to sock_udp
HendrikVE Dec 27, 2021
bc0a80c
pkg/lwip: add peek to sock_tcp
HendrikVE Dec 27, 2021
64beb73
sys/posix: add flag definitions
HendrikVE Feb 3, 2021
b30e78b
sys/posix/socket: implement MSG_PEEK for recvfrom
HendrikVE Feb 3, 2021
c6ef08b
sock_aux_peek: add and use pseudomodule
HendrikVE Jan 13, 2022
363f839
tests/lwip_sock_tcp: test both ipv4 and ipv6 by default
HendrikVE Jan 13, 2022
03ac5b4
tests/lwip_sock_udp: test both ipv4 and ipv6 by default
HendrikVE Jan 13, 2022
0976622
tests/lwip_sock_ip: test both ipv4 and ipv6 by default
HendrikVE Jan 13, 2022
d0dc832
tests/lwip_sock_ip: exclude a few boards
HendrikVE Jan 14, 2022
fcbdbde
tests/lwip_sock_udp: exclude a few boards
HendrikVE Jan 14, 2022
e12ed33
fixup! remove mutex
HendrikVE Oct 18, 2022
69d4b6f
fixup! compile members only in when using peek module
HendrikVE Oct 18, 2022
9dd2aa0
fixup! check assertion for second chunk
HendrikVE Oct 18, 2022
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
Prev Previous commit
fixup! check assertion for second chunk
  • Loading branch information
@HendrikVE
HendrikVE committed May 30, 2023
commit 9dd2aa09e9629ba606bca598c999d2d5c827b168
12 changes: 12 additions & 0 deletions pkg/lwip/contrib/sock/ip/lwip_sock_ip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,21 @@ ssize_t sock_ip_recv_aux(sock_ip_t *sock, void *data, size_t max_len,
}

assert((sock != NULL) && (data != NULL) && (max_len > 0));
const void *old_ctx = ctx;
while ((res = sock_ip_recv_buf_aux(sock, &pkt, (void **)&ctx, timeout,
remote, aux)) > 0) {

/* sock_udp_recv_buf() is supposed to return multiple packet fragments
* when called multiple times with the same context.
* In practise, this is not implemented and it will always return a pointer
* to the whole packet on the first call and NULL on the second call, which
* releases the packet.
* This assertion will trigger should the behavior change in the future.
*/
if (old_ctx) {
assert(res == 0 && ctx == NULL);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

args so @miri64 pointed out that it's actually LWIP that makes use of that and that comment is wrong 😬

}

if (peek) {
/* SOCK_AUX_PEEK was unset in previous call of sock_ip_recv_buf_aux */
aux->flags |= SOCK_AUX_PEEK;
Expand Down
12 changes: 12 additions & 0 deletions pkg/lwip/contrib/sock/udp/lwip_sock_udp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,21 @@ ssize_t sock_udp_recv_aux(sock_udp_t *sock, void *data, size_t max_len,
}

assert((sock != NULL) && (data != NULL) && (max_len > 0));
const void *old_ctx = ctx;
while ((res = sock_udp_recv_buf_aux(sock, &pkt, (void**)&ctx, timeout,
remote, aux)) > 0) {

/* sock_udp_recv_buf() is supposed to return multiple packet fragments
* when called multiple times with the same context.
* In practise, this is not implemented and it will always return a pointer
* to the whole packet on the first call and NULL on the second call, which
* releases the packet.
* This assertion will trigger should the behavior change in the future.
*/
if (old_ctx) {
assert(res == 0 && ctx == NULL);
}

if (peek) {
/* SOCK_AUX_PEEK was unset in previous call of sock_udp_recv_buf_aux */
aux->flags |= SOCK_AUX_PEEK;
Expand Down