Skip to content

Commit

Permalink
sys/net/gnrc/tcp: fix gnrc_tcp_open() netif handling
Browse files Browse the repository at this point in the history
gnrc_tcp_open() previously would eventually fail with a timeout without
sending any data when no netif was specified and a link-local target
address was used. This fixes the behavior:

- If there is only one netif, we just pick that
- If there are multiple netifs, fail directly with `-EINVAL` rather than
  sending out nothing and waiting for a timeout.

Co-authored-by: benpicco <[email protected]>
  • Loading branch information
maribu and benpicco committed Nov 12, 2024
1 parent e419c14 commit f36469a
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions sys/net/gnrc/transport_layer/tcp/gnrc_tcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "net/af.h"
#include "net/tcp.h"
#include "net/gnrc.h"
#include "net/gnrc/netif.h"
#include "net/gnrc/tcp.h"
#include "include/gnrc_tcp_common.h"
#include "include/gnrc_tcp_fsm.h"
Expand Down Expand Up @@ -394,6 +395,24 @@ int gnrc_tcp_open(gnrc_tcp_tcb_t *tcb, const gnrc_tcp_ep_t *remote, uint16_t loc
return -EINVAL;
}
tcb->ll_iface = remote->netif;

/* When the target is a link-local address and no netif is specified,
* this would otherwise not send out any data and timeout. If only
* a single netif is there, we can just take that. */
if (ipv6_addr_is_link_local((const ipv6_addr_t *)tcb->peer_addr)
&& tcb->ll_iface == SOCK_ADDR_ANY_NETIF) {
const gnrc_netif_t *first_netif = gnrc_netif_iter(NULL);
if (!first_netif) {
/* There is no netif at all */
return -EINVAL;
}
if (!gnrc_netif_highlander() && gnrc_netif_iter(first_netif)) {
/* There is at least one other netif present. We are forcing
* the use to pick one */
return -EINVAL;
}
tcb->ll_iface = first_netif->pid;
}
}
#endif

Expand Down

0 comments on commit f36469a

Please sign in to comment.