- dev - passt

[PATCH v3] repair, passt-repair: Build and warning fixes for musl
by Stefano Brivio 17 Feb '25

17 Feb '25

Checked against musl 1.2.5. Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- v3: Now 100% more trusted, with cppcheck absolutely positive about us initialising 'buf'. v2: Now 100% more tested: don't try to use the whole buffer as msg_controllen. passt-repair.c | 4 +++- repair.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/passt-repair.c b/passt-repair.c index 1174ae3..e0c366e 100644 --- a/passt-repair.c +++ b/passt-repair.c @@ -63,6 +63,7 @@ int main(int argc, char **argv) struct cmsghdr *cmsg; struct msghdr msg; struct iovec iov; + size_t cmsg_len; int op; prctl(PR_SET_DUMPABLE, 0); @@ -138,8 +139,9 @@ loop: } } if (!n) { + cmsg_len = cmsg->cmsg_len; /* socklen_t is 'unsigned' on musl */ fprintf(stderr, "Invalid ancillary data length %zu from peer\n", - cmsg->cmsg_len); + cmsg_len); _exit(1); } diff --git a/repair.c b/repair.c index d288617..dac28a6 100644 --- a/repair.c +++ b/repair.c @@ -13,6 +13,7 @@ */ #include <errno.h> +#include <sys/socket.h> #include <sys/uio.h> #include "util.h" @@ -145,9 +146,9 @@ void repair_handler(struct ctx *c, uint32_t events) */ int repair_flush(struct ctx *c) { - struct iovec iov = { &repair_cmd, sizeof(repair_cmd) }; char buf[CMSG_SPACE(sizeof(int) * SCM_MAX_FD)] - __attribute__ ((aligned(__alignof__(struct cmsghdr)))); + __attribute__ ((aligned(__alignof__(struct cmsghdr)))) = { 0 }; + struct iovec iov = { &repair_cmd, sizeof(repair_cmd) }; struct cmsghdr *cmsg; struct msghdr msg; int8_t reply; @@ -155,8 +156,12 @@ int repair_flush(struct ctx *c) if (!repair_nfds) return 0; - msg = (struct msghdr){ NULL, 0, &iov, 1, - buf, CMSG_SPACE(sizeof(int) * repair_nfds), 0 }; + msg = (struct msghdr){ .msg_name = NULL, .msg_namelen = 0, + .msg_iov = &iov, .msg_iovlen = 1, + .msg_control = buf, + .msg_controllen = CMSG_SPACE(sizeof(int) * + repair_nfds), + .msg_flags = 0 }; cmsg = CMSG_FIRSTHDR(&msg); cmsg->cmsg_level = SOL_SOCKET; -- 2.43.0

2 1

[PATCH v27 0/2] State migration, perhaps final (#2)?
by Stefano Brivio 17 Feb '25

17 Feb '25

Compared to v25, test changes only: run all the tests we added. Compared to v26: actually commit all the tests. Stefano Brivio (2): migrate: Migrate TCP flows test: Add migration tests contrib/selinux/passt.te | 4 +- flow.c | 243 +++++++++ flow.h | 8 + migrate.c | 10 + passt.c | 6 +- repair.c | 1 - tcp.c | 919 +++++++++++++++++++++++++++++++++ tcp_conn.h | 103 ++++ test/lib/layout | 55 +- test/lib/setup | 138 ++++- test/lib/test | 48 ++ test/migrate/basic | 59 +++ test/migrate/basic_fin | 62 +++ test/migrate/bidirectional | 64 +++ test/migrate/bidirectional_fin | 64 +++ test/migrate/iperf3_bidir6 | 58 +++ test/migrate/iperf3_in4 | 50 ++ test/migrate/iperf3_in6 | 58 +++ test/migrate/iperf3_many_out6 | 60 +++ test/migrate/iperf3_out4 | 47 ++ test/migrate/iperf3_out6 | 58 +++ test/migrate/rampstream_in | 12 +- test/migrate/rampstream_out | 8 +- test/run | 42 +- 24 files changed, 2158 insertions(+), 19 deletions(-) create mode 100644 test/migrate/basic create mode 100644 test/migrate/basic_fin create mode 100644 test/migrate/bidirectional create mode 100644 test/migrate/bidirectional_fin create mode 100644 test/migrate/iperf3_bidir6 create mode 100644 test/migrate/iperf3_in4 create mode 100644 test/migrate/iperf3_in6 create mode 100644 test/migrate/iperf3_many_out6 create mode 100644 test/migrate/iperf3_out4 create mode 100644 test/migrate/iperf3_out6 -- 2.43.0

2 4

[PATCH v26 0/2] State migration, perhaps final?
by Stefano Brivio 16 Feb '25

16 Feb '25

Compared to v25, test changes only: run all the tests we added. Stefano Brivio (2): migrate: Migrate TCP flows test: Add migration tests contrib/selinux/passt.te | 4 +- flow.c | 243 ++++++++++ flow.h | 8 + migrate.c | 10 + passt.c | 6 +- repair.c | 1 - tcp.c | 919 ++++++++++++++++++++++++++++++++++++ tcp_conn.h | 103 ++++ test/lib/layout | 55 ++- test/lib/setup | 138 +++++- test/lib/test | 48 ++ test/migrate/basic | 59 +++ test/migrate/bidirectional | 64 +++ test/migrate/iperf3_bidir6 | 58 +++ test/migrate/iperf3_in4 | 50 ++ test/migrate/iperf3_in6 | 58 +++ test/migrate/iperf3_out4 | 47 ++ test/migrate/iperf3_out6 | 58 +++ test/migrate/rampstream_in | 12 +- test/migrate/rampstream_out | 8 +- test/run | 42 +- 21 files changed, 1972 insertions(+), 19 deletions(-) create mode 100644 test/migrate/basic create mode 100644 test/migrate/bidirectional create mode 100644 test/migrate/iperf3_bidir6 create mode 100644 test/migrate/iperf3_in4 create mode 100644 test/migrate/iperf3_in6 create mode 100644 test/migrate/iperf3_out4 create mode 100644 test/migrate/iperf3_out6 -- 2.43.0

1 2

[PATCH] tap: always set the no_frag flag in IPv4 headers.
by Jon Maloy 16 Feb '25

16 Feb '25

When studying the Linux source code and Wireshark dumps it seems like the no_frag flag in the IPv4 header is always set. Following discussions in the Internet on this subject indicates that modern routers never fragment packets, and that it isn't even supported in many cases. Adding to this that incoming messages forwarded on the tap interface never even pass through a router it seems safe to always set this flag. This makes the IPv4 headers of forwarded messages identical to those sent by the external sockets, something we must consider desirable. Signed-off-by: Jon Maloy <jmaloy(a)redhat.com> --- tap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tap.c b/tap.c index d0673e5..44b0fc0 100644 --- a/tap.c +++ b/tap.c @@ -153,7 +153,7 @@ static void *tap_push_ip4h(struct iphdr *ip4h, struct in_addr src, ip4h->tos = 0; ip4h->tot_len = htons(l3len); ip4h->id = 0; - ip4h->frag_off = 0; + ip4h->frag_off = htons(IP_DF); ip4h->ttl = 255; ip4h->protocol = proto; ip4h->saddr = src.s_addr; -- 2.48.1

2 4

[PATCH v2] repair, passt-repair: Build and warning fixes for musl
by Stefano Brivio 15 Feb '25

15 Feb '25

Checked against musl 1.2.5. Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- v2: Now 100% more tested: don't try to use the whole buffer as msg_controllen. passt-repair.c | 4 +++- repair.c | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/passt-repair.c b/passt-repair.c index 1174ae3..e0c366e 100644 --- a/passt-repair.c +++ b/passt-repair.c @@ -63,6 +63,7 @@ int main(int argc, char **argv) struct cmsghdr *cmsg; struct msghdr msg; struct iovec iov; + size_t cmsg_len; int op; prctl(PR_SET_DUMPABLE, 0); @@ -138,8 +139,9 @@ loop: } } if (!n) { + cmsg_len = cmsg->cmsg_len; /* socklen_t is 'unsigned' on musl */ fprintf(stderr, "Invalid ancillary data length %zu from peer\n", - cmsg->cmsg_len); + cmsg_len); _exit(1); } diff --git a/repair.c b/repair.c index d288617..1d26fe6 100644 --- a/repair.c +++ b/repair.c @@ -13,6 +13,7 @@ */ #include <errno.h> +#include <sys/socket.h> #include <sys/uio.h> #include "util.h" @@ -155,8 +156,12 @@ int repair_flush(struct ctx *c) if (!repair_nfds) return 0; - msg = (struct msghdr){ NULL, 0, &iov, 1, - buf, CMSG_SPACE(sizeof(int) * repair_nfds), 0 }; + msg = (struct msghdr){ .msg_name = NULL, .msg_namelen = 0, + .msg_iov = &iov, .msg_iovlen = 1, + .msg_control = buf, + .msg_controllen = CMSG_SPACE(sizeof(int) * + repair_nfds), + .msg_flags = 0 }; cmsg = CMSG_FIRSTHDR(&msg); cmsg->cmsg_level = SOL_SOCKET; -- 2.43.0

1 0

[PATCH v25 0/2] State migration, somewhat polished
by Stefano Brivio 15 Feb '25

15 Feb '25

Notable changes compared to v24: - dropped thaw/freeze mechanism, as duplicate keep-alives gave me issues with migration of half-closed connections and in general they proved to be too rigid to quickly fix things as I needed to do. Kept all the fixes, though - fixed error handling on target, e.g. clearing flags, calling flow_cancel() as needed, etc. - added tests for half-closed sockets, fixed headers and descriptions - fix build with musl (1.25), and warnings on i686, armv6l, cppcheck and clang-tidy reports - drop "queue plugging" mechanism: it turns out that the kernel actually generates ACKs from the padding we send to our own receive queue, even in repair mode (!) All tests are happy. This looks quite solid and mergeable to me as it is. Stefano Brivio (2): migrate: Migrate TCP flows test: Add migration tests contrib/selinux/passt.te | 4 +- flow.c | 243 ++++++++++ flow.h | 8 + migrate.c | 10 + passt.c | 6 +- repair.c | 1 - tcp.c | 919 ++++++++++++++++++++++++++++++++++++ tcp_conn.h | 103 ++++ test/lib/layout | 55 ++- test/lib/setup | 138 +++++- test/lib/test | 48 ++ test/migrate/basic | 59 +++ test/migrate/bidirectional | 64 +++ test/migrate/iperf3_bidir6 | 58 +++ test/migrate/iperf3_in4 | 50 ++ test/migrate/iperf3_in6 | 58 +++ test/migrate/iperf3_out4 | 47 ++ test/migrate/iperf3_out6 | 58 +++ test/migrate/rampstream_in | 12 +- test/migrate/rampstream_out | 8 +- test/run | 34 +- 21 files changed, 1964 insertions(+), 19 deletions(-) create mode 100644 test/migrate/basic create mode 100644 test/migrate/bidirectional create mode 100644 test/migrate/iperf3_bidir6 create mode 100644 test/migrate/iperf3_in4 create mode 100644 test/migrate/iperf3_in6 create mode 100644 test/migrate/iperf3_out4 create mode 100644 test/migrate/iperf3_out6 -- 2.43.0

1 2

[PATCH] repair, passt-repair: Build and warning fixes for musl
by Stefano Brivio 15 Feb '25

15 Feb '25

Checked against musl 1.2.5. Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- passt-repair.c | 4 +++- repair.c | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/passt-repair.c b/passt-repair.c index 1174ae3..e0c366e 100644 --- a/passt-repair.c +++ b/passt-repair.c @@ -63,6 +63,7 @@ int main(int argc, char **argv) struct cmsghdr *cmsg; struct msghdr msg; struct iovec iov; + size_t cmsg_len; int op; prctl(PR_SET_DUMPABLE, 0); @@ -138,8 +139,9 @@ loop: } } if (!n) { + cmsg_len = cmsg->cmsg_len; /* socklen_t is 'unsigned' on musl */ fprintf(stderr, "Invalid ancillary data length %zu from peer\n", - cmsg->cmsg_len); + cmsg_len); _exit(1); } diff --git a/repair.c b/repair.c index d288617..64f18b7 100644 --- a/repair.c +++ b/repair.c @@ -13,6 +13,7 @@ */ #include <errno.h> +#include <sys/socket.h> #include <sys/uio.h> #include "util.h" @@ -155,8 +156,11 @@ int repair_flush(struct ctx *c) if (!repair_nfds) return 0; - msg = (struct msghdr){ NULL, 0, &iov, 1, - buf, CMSG_SPACE(sizeof(int) * repair_nfds), 0 }; + msg = (struct msghdr){ .msg_name = NULL, .msg_namelen = 0, + .msg_iov = &iov, .msg_iovlen = 1, + .msg_control = buf, + .msg_controllen = sizeof(buf), + .msg_flags = 0 }; cmsg = CMSG_FIRSTHDR(&msg); cmsg->cmsg_level = SOL_SOCKET; -- 2.43.0

1 0

[PATCH v24 0/5] State migration
by David Gibson 15 Feb '25

15 Feb '25

Rebased / integrated Stefano's patch for allowing us to carry on by sacrificing some flows in more cases. David Gibson (3): vhost_user: Clear ring address on GET_VRING_BASE flow: Flow table traversing macros flow, migrate: Flow migration skeleton Stefano Brivio (2): migrate: Migrate TCP flows test: Add migration tests contrib/selinux/passt.te | 4 +- flow.c | 335 ++++++++++++- flow.h | 13 + flow_table.h | 54 ++ migrate.c | 61 ++- migrate.h | 2 + passt.c | 6 +- repair.c | 1 - tcp.c | 950 ++++++++++++++++++++++++++++++++++++ tcp_conn.h | 99 ++++ test/lib/layout | 55 ++- test/lib/setup | 138 +++++- test/lib/test | 48 ++ test/migrate/basic | 59 +++ test/migrate/bidirectional | 64 +++ test/migrate/iperf3_bidir6 | 58 +++ test/migrate/iperf3_in4 | 50 ++ test/migrate/iperf3_in6 | 58 +++ test/migrate/iperf3_out4 | 50 ++ test/migrate/iperf3_out6 | 58 +++ test/migrate/rampstream_in | 10 +- test/migrate/rampstream_out | 6 +- test/run | 34 +- vhost_user.c | 1 + 24 files changed, 2176 insertions(+), 38 deletions(-) create mode 100644 test/migrate/basic create mode 100644 test/migrate/bidirectional create mode 100644 test/migrate/iperf3_bidir6 create mode 100644 test/migrate/iperf3_in4 create mode 100644 test/migrate/iperf3_in6 create mode 100644 test/migrate/iperf3_out4 create mode 100644 test/migrate/iperf3_out6 -- 2.48.1

2 6

[PATCH v23 0/4] State migration
by David Gibson 14 Feb '25

14 Feb '25

Brain dead today, didn't make much progress on bugs. In particular migrate/iperf3_bidir6 still fails for me with an EAGAIN trying to restore the sndq (the sent but not acked part, in repair mode). I did, however, do a substantial restructure of how we handle flow migration, which should make it easier to tweak our "pre" and "post" steps for each flow. I *think* disabling/re-enabling nonblocking mode on our sockets in the new freeze/thaw handlers will fix the EAGAIN problem, but I ran out of time before trying it. David Gibson (2): flow: Flow table traversing macros flow, migrate: Flow migration skeleton Stefano Brivio (2): migrate: Migrate TCP flows test: Add migration tests contrib/selinux/passt.te | 4 +- flow.c | 309 +++++++++++- flow.h | 13 + flow_table.h | 52 ++ migrate.c | 47 +- migrate.h | 2 + passt.c | 6 +- repair.c | 1 - tcp.c | 918 ++++++++++++++++++++++++++++++++++++ tcp_conn.h | 99 ++++ test/lib/layout | 55 ++- test/lib/setup | 138 +++++- test/lib/test | 48 ++ test/migrate/basic | 59 +++ test/migrate/bidirectional | 64 +++ test/migrate/iperf3_bidir6 | 58 +++ test/migrate/iperf3_in4 | 50 ++ test/migrate/iperf3_in6 | 58 +++ test/migrate/iperf3_out4 | 50 ++ test/migrate/iperf3_out6 | 58 +++ test/migrate/rampstream_in | 10 +- test/migrate/rampstream_out | 6 +- test/run | 34 +- 23 files changed, 2108 insertions(+), 31 deletions(-) create mode 100644 test/migrate/basic create mode 100644 test/migrate/bidirectional create mode 100644 test/migrate/iperf3_bidir6 create mode 100644 test/migrate/iperf3_in4 create mode 100644 test/migrate/iperf3_in6 create mode 100644 test/migrate/iperf3_out4 create mode 100644 test/migrate/iperf3_out6 -- 2.48.1

1 4

[PATCH] tcp, tcp_splice: Don't set SO_SNDBUF and SO_RCVBUF to maximum values
by Stefano Brivio 14 Feb '25

14 Feb '25

I added this a long long time ago because it dramatically improved throughput back then: with rmem_max and wmem_max >= 4 MiB, we would force send and receive buffer sizes for TCP sockets to the maximum allowed value. This effectively disables TCP auto-tuning, which would otherwise allow us to exceed those limits, as crazy as it might sound. But in any case, it made sense. Now that we have zero (internal) copies on every path, plus vhost-user support, it turns out that these settings are entirely obsolete. I get substantially the same throughput in every test we perform, even with very short durations (one second). The settings are not just useless: they actually cause us quite some trouble on guest state migration, because they lead to huge queues that need to be moved as well. Drop those settings. Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com> --- tcp.c | 41 +++++++++-------------------------------- tcp_conn.h | 4 ++-- tcp_splice.c | 6 +++--- 3 files changed, 14 insertions(+), 37 deletions(-) diff --git a/tcp.c b/tcp.c index 16d01f6..b978b30 100644 --- a/tcp.c +++ b/tcp.c @@ -738,24 +738,6 @@ static void tcp_get_sndbuf(struct tcp_tap_conn *conn) SNDBUF_SET(conn, MIN(INT_MAX, v)); } -/** - * tcp_sock_set_bufsize() - Set SO_RCVBUF and SO_SNDBUF to maximum values - * @s: Socket, can be -1 to avoid check in the caller - */ -static void tcp_sock_set_bufsize(const struct ctx *c, int s) -{ - int v = INT_MAX / 2; /* Kernel clamps and rounds, no need to check */ - - if (s == -1) - return; - - if (!c->low_rmem && setsockopt(s, SOL_SOCKET, SO_RCVBUF, &v, sizeof(v))) - trace("TCP: failed to set SO_RCVBUF to %i", v); - - if (!c->low_wmem && setsockopt(s, SOL_SOCKET, SO_SNDBUF, &v, sizeof(v))) - trace("TCP: failed to set SO_SNDBUF to %i", v); -} - /** * tcp_sock_set_nodelay() - Set TCP_NODELAY option (disable Nagle's algorithm) * @s: Socket, can be -1 to avoid check in the caller @@ -1278,12 +1260,11 @@ int tcp_conn_pool_sock(int pool[]) /** * tcp_conn_new_sock() - Open and prepare new socket for connection - * @c: Execution context * @af: Address family * * Return: socket number on success, negative code if socket creation failed */ -static int tcp_conn_new_sock(const struct ctx *c, sa_family_t af) +static int tcp_conn_new_sock(sa_family_t af) { int s; @@ -1297,7 +1278,6 @@ static int tcp_conn_new_sock(const struct ctx *c, sa_family_t af) if (s < 0) return -errno; - tcp_sock_set_bufsize(c, s); tcp_sock_set_nodelay(s); return s; @@ -1305,12 +1285,11 @@ static int tcp_conn_new_sock(const struct ctx *c, sa_family_t af) /** * tcp_conn_sock() - Obtain a connectable socket in the host/init namespace - * @c: Execution context * @af: Address family (AF_INET or AF_INET6) * * Return: Socket fd on success, -errno on failure */ -int tcp_conn_sock(const struct ctx *c, sa_family_t af) +int tcp_conn_sock(sa_family_t af) { int *pool = af == AF_INET6 ? init_sock_pool6 : init_sock_pool4; int s; @@ -1321,7 +1300,7 @@ int tcp_conn_sock(const struct ctx *c, sa_family_t af) /* If the pool is empty we just open a new one without refilling the * pool to keep latency down. */ - if ((s = tcp_conn_new_sock(c, af)) >= 0) + if ((s = tcp_conn_new_sock(af)) >= 0) return s; err("TCP: Unable to open socket for new connection: %s", @@ -1462,7 +1441,7 @@ static void tcp_conn_from_tap(const struct ctx *c, sa_family_t af, goto cancel; } - if ((s = tcp_conn_sock(c, af)) < 0) + if ((s = tcp_conn_sock(af)) < 0) goto cancel; pif_sockaddr(c, &sa, &sl, PIF_HOST, &tgt->eaddr, tgt->eport); @@ -1483,7 +1462,7 @@ static void tcp_conn_from_tap(const struct ctx *c, sa_family_t af, } else { /* Not a local, bound destination, inconclusive test */ close(s); - if ((s = tcp_conn_sock(c, af)) < 0) + if ((s = tcp_conn_sock(af)) < 0) goto cancel; } @@ -2090,7 +2069,6 @@ void tcp_listen_handler(const struct ctx *c, union epoll_ref ref, if (s < 0) goto cancel; - tcp_sock_set_bufsize(c, s); tcp_sock_set_nodelay(s); /* FIXME: If useful: when the listening port has a specific bound @@ -2434,13 +2412,12 @@ static int tcp_ns_socks_init(void *arg) /** * tcp_sock_refill_pool() - Refill one pool of pre-opened sockets - * @c: Execution context * @pool: Pool of sockets to refill * @af: Address family to use * * Return: 0 on success, negative error code if there was at least one error */ -int tcp_sock_refill_pool(const struct ctx *c, int pool[], sa_family_t af) +int tcp_sock_refill_pool(int pool[], sa_family_t af) { int i; @@ -2450,7 +2427,7 @@ int tcp_sock_refill_pool(const struct ctx *c, int pool[], sa_family_t af) if (pool[i] >= 0) continue; - if ((fd = tcp_conn_new_sock(c, af)) < 0) + if ((fd = tcp_conn_new_sock(af)) < 0) return fd; pool[i] = fd; @@ -2466,13 +2443,13 @@ int tcp_sock_refill_pool(const struct ctx *c, int pool[], sa_family_t af) static void tcp_sock_refill_init(const struct ctx *c) { if (c->ifi4) { - int rc = tcp_sock_refill_pool(c, init_sock_pool4, AF_INET); + int rc = tcp_sock_refill_pool(init_sock_pool4, AF_INET); if (rc < 0) warn("TCP: Error refilling IPv4 host socket pool: %s", strerror_(-rc)); } if (c->ifi6) { - int rc = tcp_sock_refill_pool(c, init_sock_pool6, AF_INET6); + int rc = tcp_sock_refill_pool(init_sock_pool6, AF_INET6); if (rc < 0) warn("TCP: Error refilling IPv6 host socket pool: %s", strerror_(-rc)); diff --git a/tcp_conn.h b/tcp_conn.h index d342680..8c20805 100644 --- a/tcp_conn.h +++ b/tcp_conn.h @@ -143,8 +143,8 @@ bool tcp_flow_defer(const struct tcp_tap_conn *conn); bool tcp_splice_flow_defer(struct tcp_splice_conn *conn); void tcp_splice_timer(const struct ctx *c, struct tcp_splice_conn *conn); int tcp_conn_pool_sock(int pool[]); -int tcp_conn_sock(const struct ctx *c, sa_family_t af); -int tcp_sock_refill_pool(const struct ctx *c, int pool[], sa_family_t af); +int tcp_conn_sock(sa_family_t af); +int tcp_sock_refill_pool(int pool[], sa_family_t af); void tcp_splice_refill(const struct ctx *c); #endif /* TCP_CONN_H */ diff --git a/tcp_splice.c b/tcp_splice.c index f048a82..f1a9223 100644 --- a/tcp_splice.c +++ b/tcp_splice.c @@ -351,7 +351,7 @@ static int tcp_splice_connect(const struct ctx *c, struct tcp_splice_conn *conn) int one = 1; if (tgtpif == PIF_HOST) - conn->s[1] = tcp_conn_sock(c, af); + conn->s[1] = tcp_conn_sock(af); else if (tgtpif == PIF_SPLICE) conn->s[1] = tcp_conn_sock_ns(c, af); else @@ -703,13 +703,13 @@ static int tcp_sock_refill_ns(void *arg) ns_enter(c); if (c->ifi4) { - int rc = tcp_sock_refill_pool(c, ns_sock_pool4, AF_INET); + int rc = tcp_sock_refill_pool(ns_sock_pool4, AF_INET); if (rc < 0) warn("TCP: Error refilling IPv4 ns socket pool: %s", strerror_(-rc)); } if (c->ifi6) { - int rc = tcp_sock_refill_pool(c, ns_sock_pool6, AF_INET6); + int rc = tcp_sock_refill_pool(ns_sock_pool6, AF_INET6); if (rc < 0) warn("TCP: Error refilling IPv6 ns socket pool: %s", strerror_(-rc)); -- 2.43.0

2 2