External/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2024-12-23 06:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcp_splice: Allow splicing of connections from IPv4-mapped loopback

Browse Source 
For non-spliced connections we now treat IPv4-mapped IPv6 addresses the
same as the corresponding IPv4 addresses.  However currently we won't
splice a connection from ::ffff:127.0.0.1 the way we would one from
127.0.0.1.  Correct this so that we can splice connections from IPv4
localhost that have been received on an IPv6 dual stack socket.

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-17 16:59:04 +11:00 committed by Stefano Brivio
parent bb6bb5649d
commit 023213facd
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tcp_splice.c
View File

@ -513,20 +513,23 @@ bool tcp_splice_conn_from_sock(struct ctx *c, union epoll_ref ref,
struct tcp_splice_conn *conn, int s, struct tcp_splice_conn *conn, int s,
const struct sockaddr *sa) const struct sockaddr *sa)
{ {
const struct in_addr *a4;
union inany_addr aany;
in_port_t port;
assert(c->mode == MODE_PASTA); assert(c->mode == MODE_PASTA);
if (sa->sa_family == AF_INET6) { inany_from_sockaddr(&aany, &port, sa);
const struct sockaddr_in6 *sa6; a4 = inany_v4(&aany);
sa6 = (const struct sockaddr_in6 *)sa; if (a4) {
if (!IN6_IS_ADDR_LOOPBACK(&sa6->sin6_addr)) if (!IN4_IS_ADDR_LOOPBACK(a4))
return false;
conn->flags = SPLICE_V6;
} else {
const struct sockaddr_in *sa4 = (const struct sockaddr_in *)sa;
if (!IN4_IS_ADDR_LOOPBACK(&sa4->sin_addr))
return false; return false;
conn->flags = 0; conn->flags = 0;
} else {
if (!IN6_IS_ADDR_LOOPBACK(&aany.a6))
return false;
conn->flags = SPLICE_V6;
} }
if (setsockopt(s, SOL_TCP, TCP_QUICKACK, &((int){ 1 }), sizeof(int))) if (setsockopt(s, SOL_TCP, TCP_QUICKACK, &((int){ 1 }), sizeof(int)))