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

udp: Add helper to extract port from a sockaddr_in or sockaddr_in6

Browse source 
udp_sock_handler_splice() has a somewhat clunky if to extract the port from
a socket address which could be either IPv4 or IPv6.  Future changes are
going to make this even more clunky, so introduce a helper function to
do this extraction.

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:13 +11:00 committed by Stefano Brivio
parent e7e2a321ba
commit c52ca4aecf
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
udp.c
View file

@ -497,6 +497,19 @@ static int udp_splice_new_ns(void *arg)
return 0; return 0;
} }
/**
* sa_port() - Determine port from a sockaddr_in or sockaddr_in6
* @v6: Is @sa a sockaddr_in6 (otherwise sockaddr_in)?
* @sa: Pointer to either sockaddr_in or sockaddr_in6
*/
static in_port_t sa_port(bool v6, const void *sa)
{
const struct sockaddr_in6 *sa6 = sa;
const struct sockaddr_in *sa4 = sa;
return v6 ? ntohs(sa6->sin6_port) : ntohs(sa4->sin_port);
}
/** /**
* udp_sock_handler_splice() - Handler for socket mapped to "spliced" connection * udp_sock_handler_splice() - Handler for socket mapped to "spliced" connection
* @c: Execution context * @c: Execution context
@ -508,8 +521,6 @@ static void udp_sock_handler_splice(const struct ctx *c, union epoll_ref ref,
uint32_t events, const struct timespec *now) uint32_t events, const struct timespec *now)
{ {
in_port_t src, dst = ref.r.p.udp.udp.port; in_port_t src, dst = ref.r.p.udp.udp.port;
struct msghdr *mh = &udp_mmh_recv[0].msg_hdr;
struct sockaddr_storage *sa_s = mh->msg_name;
int s, v6 = ref.r.p.udp.udp.v6, n, i; int s, v6 = ref.r.p.udp.udp.v6, n, i;
if (!(events & EPOLLIN)) if (!(events & EPOLLIN))
@ -520,16 +531,7 @@ static void udp_sock_handler_splice(const struct ctx *c, union epoll_ref ref,
if (n <= 0) if (n <= 0)
return; return;
if (v6) { src = sa_port(v6, udp_mmh_recv[0].msg_hdr.msg_name);
struct sockaddr_in6 *sa = (struct sockaddr_in6 *)sa_s;
src = htons(sa->sin6_port);
} else {
struct sockaddr_in *sa = (struct sockaddr_in *)sa_s;
src = ntohs(sa->sin_port);
}
if (ref.r.p.udp.udp.ns) { if (ref.r.p.udp.udp.ns) {
src += c->udp.fwd_in.rdelta[src]; src += c->udp.fwd_in.rdelta[src];