diff options
| author | Stefano Brivio <sbrivio@redhat.com> | 2023-03-08 12:38:39 +0100 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2023-03-09 03:44:21 +0100 |
| commit | 5aea2f88ab5f63f01885109a4afb1271607fc06b (patch) | |
| tree | 6ed6fbda7504a00da18fcc977492ee4172680777 /udp.c | |
| parent | 73992c42cea0df56f6ba0a3bef0f4a939f26ebad (diff) | |
| download | passt-5aea2f88ab5f63f01885109a4afb1271607fc06b.tar passt-5aea2f88ab5f63f01885109a4afb1271607fc06b.tar.gz passt-5aea2f88ab5f63f01885109a4afb1271607fc06b.tar.bz2 passt-5aea2f88ab5f63f01885109a4afb1271607fc06b.tar.lz passt-5aea2f88ab5f63f01885109a4afb1271607fc06b.tar.xz passt-5aea2f88ab5f63f01885109a4afb1271607fc06b.tar.zst passt-5aea2f88ab5f63f01885109a4afb1271607fc06b.zip | |
tcp, udp: Fix partial success return codes in {tcp,udp}_sock_init()
The comments say we should return 0 on partial success, and an error
code on complete failure. Rationale: if the user configures a port
forwarding, and we succeed to bind that port for IPv4 or IPv6 only,
that might actually be what the user intended.
Adjust the two functions to reflect the comments.
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'udp.c')
| -rw-r--r-- | udp.c | 30 |
1 files changed, 14 insertions, 16 deletions
@@ -983,7 +983,7 @@ int udp_sock_init(const struct ctx *c, int ns, sa_family_t af, const void *addr, const char *ifname, in_port_t port) { union udp_epoll_ref uref = { .u32 = 0 }; - int s, ret = 0; + int s, r4 = SOCKET_MAX + 1, r6 = SOCKET_MAX + 1; if (ns) { uref.udp.port = (in_port_t)(port + @@ -999,8 +999,8 @@ int udp_sock_init(const struct ctx *c, int ns, sa_family_t af, uref.udp.orig = true; if (!ns) { - s = sock_l4(c, AF_INET, IPPROTO_UDP, addr, ifname, - port, uref.u32); + r4 = s = sock_l4(c, AF_INET, IPPROTO_UDP, addr, + ifname, port, uref.u32); udp_tap_map[V4][uref.udp.port].sock = s < 0 ? -1 : s; udp_splice_init[V4][port].sock = s < 0 ? -1 : s; @@ -1008,13 +1008,10 @@ int udp_sock_init(const struct ctx *c, int ns, sa_family_t af, struct in_addr loopback = { htonl(INADDR_LOOPBACK) }; uref.udp.ns = true; - s = sock_l4(c, AF_INET, IPPROTO_UDP, &loopback, - ifname, port, uref.u32); + r4 = s = sock_l4(c, AF_INET, IPPROTO_UDP, &loopback, + ifname, port, uref.u32); udp_splice_ns[V4][port].sock = s < 0 ? -1 : s; } - - if (s < 0) - ret = s; } if ((af == AF_INET6 || af == AF_UNSPEC) && c->ifi6) { @@ -1023,24 +1020,25 @@ int udp_sock_init(const struct ctx *c, int ns, sa_family_t af, uref.udp.orig = true; if (!ns) { - s = sock_l4(c, AF_INET6, IPPROTO_UDP, addr, ifname, - port, uref.u32); + r6 = s = sock_l4(c, AF_INET6, IPPROTO_UDP, addr, + ifname, port, uref.u32); udp_tap_map[V6][uref.udp.port].sock = s < 0 ? -1 : s; udp_splice_init[V6][port].sock = s < 0 ? -1 : s; } else { uref.udp.ns = true; - s = sock_l4(c, AF_INET6, IPPROTO_UDP, &in6addr_loopback, - ifname, port, uref.u32); + r6 = s = sock_l4(c, AF_INET6, IPPROTO_UDP, + &in6addr_loopback, + ifname, port, uref.u32); udp_splice_ns[V6][port].sock = s < 0 ? -1 : s; } - - if (s < 0) - ret = s; } - return ret; + if (IN_INTERVAL(0, SOCKET_MAX, r4) || IN_INTERVAL(0, SOCKET_MAX, r6)) + return 0; + + return r4 < 0 ? r4 : r6; } /** |