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

tcp_splice: Eliminate SPLICE_V6 flag

Browse source 
Since we're now constructing socket addresses based on information in the
flowside, we no longer need an explicit flag to tell if we're dealing with
an IPv4 or IPv6 connection.  Hence, drop the now unused SPLICE_V6 flag.

As well as just simplifying the code, this allows for possible future
extensions where we could splice an IPv4 connection to an IPv6 connection
or vice versa.

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 2024-07-18 15:26:33 +10:00 committed by Stefano Brivio
parent 528a6517f8
commit f19a8f71f9
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tcp_conn.h
View file

@ -125,10 +125,9 @@ struct tcp_splice_conn {
#define FIN_SENT(sidei_) ((sidei_) ? BIT(7) : BIT(6)) #define FIN_SENT(sidei_) ((sidei_) ? BIT(7) : BIT(6))
uint8_t flags; uint8_t flags;
#define SPLICE_V6 BIT(0) #define RCVLOWAT_SET(sidei_) ((sidei_) ? BIT(1) : BIT(0))
#define RCVLOWAT_SET(sidei_) ((sidei_) ? BIT(2) : BIT(1)) #define RCVLOWAT_ACT(sidei_) ((sidei_) ? BIT(3) : BIT(2))
#define RCVLOWAT_ACT(sidei_) ((sidei_) ? BIT(4) : BIT(3)) #define CLOSING BIT(4)
#define CLOSING BIT(5)
bool in_epoll :1; bool in_epoll :1;
}; };

3
tcp_splice.c
View file

@ -73,8 +73,6 @@ static int ns_sock_pool6 [TCP_SOCK_POOL_SIZE];
/* Pool of pre-opened pipes */ /* Pool of pre-opened pipes */
static int splice_pipe_pool [TCP_SPLICE_PIPE_POOL_SIZE][2]; static int splice_pipe_pool [TCP_SPLICE_PIPE_POOL_SIZE][2];
#define CONN_V6(x) ((x)->flags & SPLICE_V6)
#define CONN_V4(x) (!CONN_V6(x))
#define CONN_HAS(conn, set) (((conn)->events & (set)) == (set)) #define CONN_HAS(conn, set) (((conn)->events & (set)) == (set))
/* Display strings for connection events */ /* Display strings for connection events */
@ -483,7 +481,6 @@ bool tcp_splice_conn_from_sock(const struct ctx *c,
NULL, 0, &in6addr_loopback, dstport); NULL, 0, &in6addr_loopback, dstport);
conn = FLOW_SET_TYPE(flow, FLOW_TCP_SPLICE, tcp_splice); conn = FLOW_SET_TYPE(flow, FLOW_TCP_SPLICE, tcp_splice);
conn->flags = af == AF_INET ? 0 : SPLICE_V6;
conn->s[0] = s0; conn->s[0] = s0;
conn->s[1] = -1; conn->s[1] = -1;
conn->pipe[0][0] = conn->pipe[0][1] = -1; conn->pipe[0][0] = conn->pipe[0][1] = -1;