mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

udp: Simplify udp_sock_handler_splice

Browse source 
Previous cleanups mean that we can now rework some complex ifs in
udp_sock_handler_splice() into a simpler set.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2022-11-30 15:13:11 +11:00 committed by Stefano Brivio
parent 71d2595a8f
commit 5b0027f942
1 changed files with 16 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
udp.c
View file

@ -532,50 +532,33 @@ static void udp_sock_handler_splice(const struct ctx *c, union epoll_ref ref,
} }
if (ref.r.p.udp.udp.orig && !ref.r.p.udp.udp.ns) { if (ref.r.p.udp.udp.ns) {
src += c->udp.fwd_out.rdelta[src]; src += c->udp.fwd_in.rdelta[src];
s = udp_splice_init[v6][src].sock;
if (!s && ref.r.p.udp.udp.orig)
s = udp_splice_new(c, v6, src, false);
if (!(s = udp_splice_ns[v6][src].sock)) { if (s < 0)
return;
udp_splice_ns[v6][dst].ts = now->tv_sec;
udp_splice_init[v6][src].ts = now->tv_sec;
} else {
src += c->udp.fwd_out.rdelta[src];
s = udp_splice_ns[v6][src].sock;
if (!s && ref.r.p.udp.udp.orig) {
struct udp_splice_new_ns_arg arg = { struct udp_splice_new_ns_arg arg = {
c, v6, src, -1, c, v6, src, -1,
}; };
NS_CALL(udp_splice_new_ns, &arg); NS_CALL(udp_splice_new_ns, &arg);
if ((s = arg.s) < 0) s = arg.s;
return;
} }
if (s < 0)
udp_splice_init[v6][dst].ts = now->tv_sec;
udp_splice_ns[v6][src].ts = now->tv_sec;
} else if (!ref.r.p.udp.udp.orig && ref.r.p.udp.udp.ns) {
src += c->udp.fwd_in.rdelta[src];
if (!(s = udp_splice_init[v6][src].sock))
return;
udp_splice_ns[v6][dst].ts = now->tv_sec;
udp_splice_init[v6][src].ts = now->tv_sec;
} else if (ref.r.p.udp.udp.orig && ref.r.p.udp.udp.ns) {
src += c->udp.fwd_in.rdelta[src];
if (!(s = udp_splice_init[v6][src].sock)) {
s = udp_splice_new(c, v6, src, false);
if (s < 0)
return;
}
udp_splice_ns[v6][dst].ts = now->tv_sec;
udp_splice_init[v6][src].ts = now->tv_sec;
} else if (!ref.r.p.udp.udp.orig && !ref.r.p.udp.udp.ns) {
src += c->udp.fwd_out.rdelta[src];
if (!(s = udp_splice_ns[v6][src].sock))
return; return;
udp_splice_init[v6][dst].ts = now->tv_sec; udp_splice_init[v6][dst].ts = now->tv_sec;
udp_splice_ns[v6][src].ts = now->tv_sec; udp_splice_ns[v6][src].ts = now->tv_sec;
} else {
return;
} }
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {