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(a)gibson.dropbear.id.au>
---
tcp_conn.h | 7 +++----
tcp_splice.c | 3 ---
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/tcp_conn.h b/tcp_conn.h
index 4e7c57a4..6ae05115 100644
--- a/tcp_conn.h
+++ b/tcp_conn.h
@@ -125,10 +125,9 @@ struct tcp_splice_conn {
#define FIN_SENT(sidei_) ((sidei_) ? BIT(7) : BIT(6))
uint8_t flags;
-#define SPLICE_V6 BIT(0)
-#define RCVLOWAT_SET(sidei_) ((sidei_) ? BIT(2) : BIT(1))
-#define RCVLOWAT_ACT(sidei_) ((sidei_) ? BIT(4) : BIT(3))
-#define CLOSING BIT(5)
+#define RCVLOWAT_SET(sidei_) ((sidei_) ? BIT(1) : BIT(0))
+#define RCVLOWAT_ACT(sidei_) ((sidei_) ? BIT(3) : BIT(2))
+#define CLOSING BIT(4)
bool in_epoll :1;
};
diff --git a/tcp_splice.c b/tcp_splice.c
index 608e7f27..c81daeeb 100644
--- a/tcp_splice.c
+++ b/tcp_splice.c
@@ -73,8 +73,6 @@ static int ns_sock_pool6 [TCP_SOCK_POOL_SIZE];
/* Pool of pre-opened pipes */
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))
/* Display strings for connection events */
@@ -483,7 +481,6 @@ bool tcp_splice_conn_from_sock(const struct ctx *c,
NULL, 0, &in6addr_loopback, dstport);
conn = FLOW_SET_TYPE(flow, FLOW_TCP_SPLICE, tcp_splice);
- conn->flags = af == AF_INET ? 0 : SPLICE_V6;
conn->s[0] = s0;
conn->s[1] = -1;
conn->pipe[0][0] = conn->pipe[0][1] = -1;
--
2.45.2