mirrors/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2025-06-06 16:06:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

udp: Fold udp_splice_prepare and udp_splice_send into udp_sock_to_sock

Browse source 
udp_splice() prepare and udp_splice_send() are both quite simple functions
that now have only one caller: udp_sock_to_sock().  Fold them both into
that caller.

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 2025-04-04 21:15:41 +11:00 • committed by Stefano Brivio
parent bd6a41ee76
commit 9eb5406260
1 changed files with 15 additions and 40 deletions

55
udp.c
View file

@ -250,43 +250,6 @@ static void udp_iov_init(const struct ctx *c)
udp_iov_init_one(c, i); udp_iov_init_one(c, i);
} }
/**
* udp_splice_prepare() - Prepare one datagram for splicing
* @mmh: Receiving mmsghdr array
* @idx: Index of the datagram to prepare
*/
static void udp_splice_prepare(struct mmsghdr *mmh, unsigned idx)
{
udp_mh_splice[idx].msg_hdr.msg_iov->iov_len = mmh[idx].msg_len;
}
/**
* udp_splice_send() - Send a batch of datagrams from socket to socket
* @c: Execution context
* @start: Index of batch's first datagram in udp[46]_l2_buf
* @n: Number of datagrams in batch
* @src: Source port for datagram (target side)
* @dst: Destination port for datagrams (target side)
* @ref: epoll reference for origin socket
* @now: Timestamp
*
* #syscalls sendmmsg
*/
static void udp_splice_send(const struct ctx *c, size_t start, size_t n,
flow_sidx_t tosidx)
{
const struct flowside *toside = flowside_at_sidx(tosidx);
const struct udp_flow *uflow = udp_at_sidx(tosidx);
uint8_t topif = pif_at_sidx(tosidx);
int s = uflow->s[tosidx.sidei];
socklen_t sl;
pif_sockaddr(c, &udp_splice_to, &sl, topif,
&toside->eaddr, toside->eport);
sendmmsg(s, udp_mh_splice + start, n, MSG_NOSIGNAL);
}
/** /**
* udp_update_hdr4() - Update headers for one IPv4 datagram * udp_update_hdr4() - Update headers for one IPv4 datagram
* @ip4h: Pre-filled IPv4 header (except for tot_len and saddr) * @ip4h: Pre-filled IPv4 header (except for tot_len and saddr)
@ -678,19 +641,31 @@ static int udp_sock_recv(const struct ctx *c, int s, struct mmsghdr *mmh, int n)
* @from_s: Socket to receive datagrams from * @from_s: Socket to receive datagrams from
* @n: Maximum number of datagrams to forward * @n: Maximum number of datagrams to forward
* @tosidx: Flow & side to forward datagrams to * @tosidx: Flow & side to forward datagrams to
*
* #syscalls sendmmsg
*/ */
static void udp_sock_to_sock(const struct ctx *c, int from_s, int n, static void udp_sock_to_sock(const struct ctx *c, int from_s, int n,
flow_sidx_t tosidx) flow_sidx_t tosidx)
{ {
const struct flowside *toside = flowside_at_sidx(tosidx);
const struct udp_flow *uflow = udp_at_sidx(tosidx);
uint8_t topif = pif_at_sidx(tosidx);
int to_s = uflow->s[tosidx.sidei];
socklen_t sl;
int i; int i;
if ((n = udp_sock_recv(c, from_s, udp_mh_recv, n)) <= 0) if ((n = udp_sock_recv(c, from_s, udp_mh_recv, n)) <= 0)
return; return;
for (i = 0; i < n; i++) for (i = 0; i < n; i++) {
udp_splice_prepare(udp_mh_recv, i); udp_mh_splice[i].msg_hdr.msg_iov->iov_len
= udp_mh_recv[i].msg_len;
}
udp_splice_send(c, 0, n, tosidx); pif_sockaddr(c, &udp_splice_to, &sl, topif,
&toside->eaddr, toside->eport);
sendmmsg(to_s, udp_mh_splice, n, MSG_NOSIGNAL);
} }
/** /**