RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

gnrc_sock_udp: accept response from any address if remote is multicast

Browse Source
This commit is contained in:
Benjamin Valentin 2022-11-07 16:57:33 +01:00 committed by Benjamin Valentin
parent 5a3045117e
commit 2b92e9ec59
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/include/net/sock.h
View File

@ -143,7 +143,8 @@ extern "C" {
* @anchor net_sock_flags * @anchor net_sock_flags
* @{ * @{
*/ */
#define SOCK_FLAGS_REUSE_EP (0x0001) /**< allow to reuse end point on bind */ #define SOCK_FLAGS_REUSE_EP (0x0001) /**< allow to reuse end point on bind */
#define SOCK_FLAGS_CONNECT_REMOTE (0x0002) /**< restrict responses to remote address */
/** @} */ /** @} */
/** /**

28
sys/net/gnrc/sock/udp/gnrc_sock_udp.c
View File

@ -136,6 +136,12 @@ int sock_udp_create(sock_udp_t *sock, const sock_udp_ep_t *local,
} }
gnrc_ep_set((sock_ip_ep_t *)&sock->remote, gnrc_ep_set((sock_ip_ep_t *)&sock->remote,
(sock_ip_ep_t *)remote, sizeof(sock_udp_ep_t)); (sock_ip_ep_t *)remote, sizeof(sock_udp_ep_t));
/* only accept responses from the set remote */
if (!ipv6_addr_is_multicast((ipv6_addr_t *)&remote->addr) &&
!ipv6_addr_is_unspecified((ipv6_addr_t *)&remote->addr)) {
flags |= SOCK_FLAGS_CONNECT_REMOTE;
}
} }
if (local != NULL) { if (local != NULL) {
/* listen only with local given */ /* listen only with local given */
@ -200,22 +206,22 @@ ssize_t sock_udp_recv_aux(sock_udp_t *sock, void *data, size_t max_len,
return (nobufs) ? -ENOBUFS : ((res < 0) ? res : ret); return (nobufs) ? -ENOBUFS : ((res < 0) ? res : ret);
} }
static bool _remote_mismatch(const sock_udp_t *sock, const udp_hdr_t *hdr, const sock_ip_ep_t *remote) static bool _remote_accept(const sock_udp_t *sock, const udp_hdr_t *hdr,
const sock_ip_ep_t *remote)
{ {
if ((sock->flags & SOCK_FLAGS_CONNECT_REMOTE) == 0) {
/* socket is not bound to a remote */
return true;
}
if (sock->remote.family == AF_UNSPEC) { if (sock->remote.family == AF_UNSPEC) {
/* socket accepts any remote */ /* socket accepts any remote */
return false; return true;
} }
if (sock->remote.port != byteorder_ntohs(hdr->src_port)) { if (sock->remote.port != byteorder_ntohs(hdr->src_port)) {
DEBUG("gnrc_sock_udp: port mismatch (%u != %u)\n", DEBUG("gnrc_sock_udp: port mismatch (%u != %u)\n",
sock->remote.port, byteorder_ntohs(hdr->src_port)); sock->remote.port, byteorder_ntohs(hdr->src_port));
return true;
}
/* We only have IPv6 for now, so just comparing the whole end point should suffice */
if (memcmp(&sock->remote.addr, &ipv6_addr_unspecified, sizeof(ipv6_addr_t)) == 0) {
/* socket accepts any remote address */
return false; return false;
} }
@ -225,10 +231,10 @@ static bool _remote_mismatch(const sock_udp_t *sock, const udp_hdr_t *hdr, const
ipv6_addr_to_str(addr_str, (ipv6_addr_t *)&sock->remote.addr, sizeof(addr_str))); ipv6_addr_to_str(addr_str, (ipv6_addr_t *)&sock->remote.addr, sizeof(addr_str)));
DEBUG(", source (%s) does not match\n", DEBUG(", source (%s) does not match\n",
ipv6_addr_to_str(addr_str, (ipv6_addr_t *)&remote->addr, sizeof(addr_str))); ipv6_addr_to_str(addr_str, (ipv6_addr_t *)&remote->addr, sizeof(addr_str)));
return true; return false;
} }
return false; return true;
} }
ssize_t sock_udp_recv_buf_aux(sock_udp_t *sock, void **data, void **buf_ctx, ssize_t sock_udp_recv_buf_aux(sock_udp_t *sock, void **data, void **buf_ctx,
@ -280,7 +286,7 @@ ssize_t sock_udp_recv_buf_aux(sock_udp_t *sock, void **data, void **buf_ctx,
memcpy(remote, &tmp, sizeof(tmp)); memcpy(remote, &tmp, sizeof(tmp));
remote->port = byteorder_ntohs(hdr->src_port); remote->port = byteorder_ntohs(hdr->src_port);
} }
if (_remote_mismatch(sock, hdr, &tmp)) { if (!_remote_accept(sock, hdr, &tmp)) {
gnrc_pktbuf_release(pkt); gnrc_pktbuf_release(pkt);
return -EPROTO; return -EPROTO;
} }