diff options
author | Stefano Brivio <sbrivio@redhat.com> | 2021-04-29 16:59:20 +0200 |
---|---|---|
committer | Stefano Brivio <sbrivio@redhat.com> | 2021-04-29 17:15:26 +0200 |
commit | 605af213c5e0fa047f6d8caef5bcef61a0987c8d (patch) | |
tree | 45615e603964adee64bfecdc40e119bd33d77859 /util.c | |
parent | 50bcddabc9e2c0dbd313a61cda1606045a67a8de (diff) | |
download | passt-605af213c5e0fa047f6d8caef5bcef61a0987c8d.tar passt-605af213c5e0fa047f6d8caef5bcef61a0987c8d.tar.gz passt-605af213c5e0fa047f6d8caef5bcef61a0987c8d.tar.bz2 passt-605af213c5e0fa047f6d8caef5bcef61a0987c8d.tar.lz passt-605af213c5e0fa047f6d8caef5bcef61a0987c8d.tar.xz passt-605af213c5e0fa047f6d8caef5bcef61a0987c8d.tar.zst passt-605af213c5e0fa047f6d8caef5bcef61a0987c8d.zip |
udp: Connection tracking for ephemeral, local ports, and related fixes
As we support UDP forwarding for packets that are sent to local
ports, we actually need some kind of connection tracking for UDP.
While at it, this commit introduces a number of vaguely related fixes
for issues observed while trying this out. In detail:
- implement an explicit, albeit minimalistic, connection tracking
for UDP, to allow usage of ephemeral ports by the guest and by
the host at the same time, by binding them dynamically as needed,
and to allow mapping address changes for packets with a loopback
address as destination
- set the guest MAC address whenever we receive a packet from tap
instead of waiting for an ARP request, and set it to broadcast on
start, otherwise DHCPv6 might not work if all DHCPv6 requests time
out before the guest starts talking IPv4
- split context IPv6 address into address we assign, global or site
address seen on tap, and link-local address seen on tap, and make
sure we use the addresses we've seen as destination (link-local
choice depends on source address). Similarly, for IPv4, split into
address we assign and address we observe, and use the address we
observe as destination
- introduce a clock_gettime() syscall right after epoll_wait() wakes
up, so that we can remove all the other ones and pass the current
timestamp to tap and socket handlers -- this is additionally needed
by UDP to time out bindings to ephemeral ports and mappings between
loopback address and a local address
- rename sock_l4_add() to sock_l4(), no semantic changes intended
- include <arpa/inet.h> in passt.c before kernel headers so that we
can use <netinet/in.h> macros to check IPv6 address types, and
remove a duplicate <linux/ip.h> inclusion
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -155,15 +155,15 @@ char *ipv6_l4hdr(struct ipv6hdr *ip6h, uint8_t *proto) } /** - * sock_l4_add() - Create and bind socket for given L4, add to epoll list + * sock_l4() - Create and bind socket for given L4, add to epoll list * @c: Execution context - * @v: IP protocol, 4 or 6 + * @af: Address family, AF_INET or AF_INET6 * @proto: Protocol number, host order - * @port: Port, network order + * @port: Port, host order * * Return: newly created socket, -1 on error */ -int sock_l4_add(struct ctx *c, int v, uint16_t proto, uint16_t port) +int sock_l4(struct ctx *c, int af, uint16_t proto, uint16_t port) { struct sockaddr_in addr4 = { .sin_family = AF_INET, @@ -183,8 +183,7 @@ int sock_l4_add(struct ctx *c, int v, uint16_t proto, uint16_t port) proto != IPPROTO_ICMP && proto != IPPROTO_ICMPV6) return -1; /* Not implemented. */ - fd = socket(v == 4 ? AF_INET : AF_INET6, - proto == IPPROTO_TCP ? SOCK_STREAM : SOCK_DGRAM, proto); + fd = socket(af, proto == IPPROTO_TCP ? SOCK_STREAM : SOCK_DGRAM, proto); if (fd < 0) { perror("L4 socket"); return -1; @@ -198,7 +197,7 @@ int sock_l4_add(struct ctx *c, int v, uint16_t proto, uint16_t port) if (proto == IPPROTO_ICMP || proto == IPPROTO_ICMPV6) goto epoll_add; - if (v == 4) { + if (af == AF_INET) { sa = (const struct sockaddr *)&addr4; sl = sizeof(addr4); } else { @@ -208,6 +207,9 @@ int sock_l4_add(struct ctx *c, int v, uint16_t proto, uint16_t port) setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one)); } + if (proto == IPPROTO_UDP && PORT_IS_EPHEMERAL(port)) + goto epoll_add; + if (bind(fd, sa, sl) < 0) { /* We'll fail to bind to low ports if we don't have enough * capabilities, and we'll fail to bind on already bound ports, |