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

udp: Improve name of UDP related ICMP sending functions

Browse source 
udp_send_conn_fail_icmp[46]() aren't actually specific to connections
failing: they can propagate a variety of ICMP errors, which might or might
not break a "connection".  They are, however, specific to sending ICMP
errors to the tap connection, not splice or host.  Rename them to better
reflect that.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Acked-by: Jon Maloy <jmaloy@redhat.com>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2025-03-28 14:34:15 +11:00 • committed by Stefano Brivio
parent 025a3c2686
commit 3de5af6e41
1 changed files with 17 additions and 18 deletions

35
udp.c
View file

@ -411,7 +411,7 @@ static void udp_tap_prepare(const struct mmsghdr *mmh,
} }
/** /**
* udp_send_conn_fail_icmp4() - Construct and send ICMPv4 to local peer * udp_send_tap_icmp4() - Construct and send ICMPv4 to local peer
* @c: Execution context * @c: Execution context
* @ee: Extended error descriptor * @ee: Extended error descriptor
* @toside: Destination side of flow * @toside: Destination side of flow
@ -419,11 +419,11 @@ static void udp_tap_prepare(const struct mmsghdr *mmh,
* @in: First bytes (max 8) of original UDP message body * @in: First bytes (max 8) of original UDP message body
* @dlen: Length of the read part of original UDP message body * @dlen: Length of the read part of original UDP message body
*/ */
static void udp_send_conn_fail_icmp4(const struct ctx *c, static void udp_send_tap_icmp4(const struct ctx *c,
const struct sock_extended_err *ee, const struct sock_extended_err *ee,
const struct flowside *toside, const struct flowside *toside,
struct in_addr saddr, struct in_addr saddr,
const void *in, size_t dlen) const void *in, size_t dlen)
{ {
struct in_addr oaddr = toside->oaddr.v4mapped.a4; struct in_addr oaddr = toside->oaddr.v4mapped.a4;
struct in_addr eaddr = toside->eaddr.v4mapped.a4; struct in_addr eaddr = toside->eaddr.v4mapped.a4;
@ -455,7 +455,7 @@ static void udp_send_conn_fail_icmp4(const struct ctx *c,
/** /**
* udp_send_conn_fail_icmp6() - Construct and send ICMPv6 to local peer * udp_send_tap_icmp6() - Construct and send ICMPv6 to local peer
* @c: Execution context * @c: Execution context
* @ee: Extended error descriptor * @ee: Extended error descriptor
* @toside: Destination side of flow * @toside: Destination side of flow
@ -464,11 +464,11 @@ static void udp_send_conn_fail_icmp4(const struct ctx *c,
* @dlen: Length of the read part of original UDP message body * @dlen: Length of the read part of original UDP message body
* @flow: IPv6 flow identifier * @flow: IPv6 flow identifier
*/ */
static void udp_send_conn_fail_icmp6(const struct ctx *c, static void udp_send_tap_icmp6(const struct ctx *c,
const struct sock_extended_err *ee, const struct sock_extended_err *ee,
const struct flowside *toside, const struct flowside *toside,
const struct in6_addr *saddr, const struct in6_addr *saddr,
void *in, size_t dlen, uint32_t flow) void *in, size_t dlen, uint32_t flow)
{ {
const struct in6_addr *oaddr = &toside->oaddr.a6; const struct in6_addr *oaddr = &toside->oaddr.a6;
const struct in6_addr *eaddr = &toside->eaddr.a6; const struct in6_addr *eaddr = &toside->eaddr.a6;
@ -565,13 +565,12 @@ static int udp_sock_recverr(const struct ctx *c, union epoll_ref ref)
* to socket? */ * to socket? */
} else if (hdr->cmsg_level == IPPROTO_IP) { } else if (hdr->cmsg_level == IPPROTO_IP) {
dlen = MIN(dlen, ICMP4_MAX_DLEN); dlen = MIN(dlen, ICMP4_MAX_DLEN);
udp_send_conn_fail_icmp4(c, &eh->ee, toside, udp_send_tap_icmp4(c, &eh->ee, toside,
eh->saddr.sa4.sin_addr, eh->saddr.sa4.sin_addr, data, dlen);
data, dlen);
} else if (hdr->cmsg_level == IPPROTO_IPV6) { } else if (hdr->cmsg_level == IPPROTO_IPV6) {
udp_send_conn_fail_icmp6(c, &eh->ee, toside, udp_send_tap_icmp6(c, &eh->ee, toside,
&eh->saddr.sa6.sin6_addr, &eh->saddr.sa6.sin6_addr, data,
data, dlen, sidx.flowi); dlen, sidx.flowi);
} }
} else { } else {
trace("Ignoring received IP_RECVERR cmsg on listener socket"); trace("Ignoring received IP_RECVERR cmsg on listener socket");