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

udp: Clean up ref initialisation in udp_sock_init()

Browse source 
udp_sock_init() has a number of paths that initialise uref differently.
However some of the fields are initialised the same way in all of them.
Move those fields into the original initialiser to save a few lines.

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 2023-11-07 12:40:13 +11:00 committed by Stefano Brivio
parent c09d0d0f60
commit 0d73fa2225
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
udp.c
View file

@ -969,7 +969,8 @@ int udp_tap_handler(struct ctx *c, int af, const void *saddr, const void *daddr,
int udp_sock_init(const struct ctx *c, int ns, sa_family_t af, int udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
const void *addr, const char *ifname, in_port_t port) const void *addr, const char *ifname, in_port_t port)
{ {
union udp_epoll_ref uref = { .u32 = 0 }; union udp_epoll_ref uref = { .splice = (c->mode == MODE_PASTA),
.orig = true };
int s, r4 = FD_REF_MAX + 1, r6 = FD_REF_MAX + 1; int s, r4 = FD_REF_MAX + 1, r6 = FD_REF_MAX + 1;
if (ns) { if (ns) {
@ -980,8 +981,6 @@ int udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
if ((af == AF_INET || af == AF_UNSPEC) && c->ifi4) { if ((af == AF_INET || af == AF_UNSPEC) && c->ifi4) {
uref.v6 = 0; uref.v6 = 0;
uref.splice = (c->mode == MODE_PASTA);
uref.orig = true;
if (!ns) { if (!ns) {
r4 = s = sock_l4(c, AF_INET, IPPROTO_UDP, addr, r4 = s = sock_l4(c, AF_INET, IPPROTO_UDP, addr,
@ -1001,8 +1000,6 @@ int udp_sock_init(const struct ctx *c, int ns, sa_family_t af,
if ((af == AF_INET6 || af == AF_UNSPEC) && c->ifi6) { if ((af == AF_INET6 || af == AF_UNSPEC) && c->ifi6) {
uref.v6 = 1; uref.v6 = 1;
uref.splice = (c->mode == MODE_PASTA);
uref.orig = true;
if (!ns) { if (!ns) {
r6 = s = sock_l4(c, AF_INET6, IPPROTO_UDP, addr, r6 = s = sock_l4(c, AF_INET6, IPPROTO_UDP, addr,