aboutgitcodebugslistschat
path: root/tcp.c
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2023-02-14 10:48:22 +1100
committerStefano Brivio <sbrivio@redhat.com>2023-02-14 17:25:11 +0100
commitdc467d526fa2f2f4589b175c42f77b5977ad5975 (patch)
treec35013ef7913ab584385799e9ca9a15bbf235ad4 /tcp.c
parent912d37cd5b8c507d17f38758d50ff3ba0401a99c (diff)
downloadpasst-dc467d526fa2f2f4589b175c42f77b5977ad5975.tar
passt-dc467d526fa2f2f4589b175c42f77b5977ad5975.tar.gz
passt-dc467d526fa2f2f4589b175c42f77b5977ad5975.tar.bz2
passt-dc467d526fa2f2f4589b175c42f77b5977ad5975.tar.lz
passt-dc467d526fa2f2f4589b175c42f77b5977ad5975.tar.xz
passt-dc467d526fa2f2f4589b175c42f77b5977ad5975.tar.zst
passt-dc467d526fa2f2f4589b175c42f77b5977ad5975.zip
tcp: Split pool lookup from creating new sockets in tcp_conn_new_sock()
tcp_conn_new_sock() first looks for a socket in a pre-opened pool, then if that's empty creates a new socket in the init namespace. Both parts of this are duplicated in other places: the pool lookup logic is duplicated in tcp_splice_new(), and the socket opening logic is duplicated in tcp_sock_refill_pool(). Split the function into separate parts so we can remove both these duplications. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'tcp.c')
-rw-r--r--tcp.c53
1 files changed, 28 insertions, 25 deletions
diff --git a/tcp.c b/tcp.c
index 2f40d62..a0e2e34 100644
--- a/tcp.c
+++ b/tcp.c
@@ -1858,24 +1858,35 @@ static void tcp_seq_init(const struct ctx *c, struct tcp_tap_conn *conn,
}
/**
- * tcp_conn_new_sock() - Get socket for new connection from pool or make new one
- * @c: Execution context
- * @af: Address family
+ * tcp_conn_pool_sock() - Get socket for new connection from pre-opened pool
+ * @pool: Pool of pre-opened sockets
*
- * Return: socket number if available, negative code if socket creation failed
+ * Return: socket number if available, negative code if pool is empty
*/
-static int tcp_conn_new_sock(const struct ctx *c, sa_family_t af)
+int tcp_conn_pool_sock(int pool[])
{
- int *p = af == AF_INET6 ? init_sock_pool6 : init_sock_pool4, i, s = -1;
+ int s = -1, i;
- for (i = 0; i < TCP_SOCK_POOL_SIZE; i++, p++) {
- SWAP(s, *p);
+ for (i = 0; i < TCP_SOCK_POOL_SIZE; i++) {
+ SWAP(s, pool[i]);
if (s >= 0)
- break;
+ return s;
}
+ return -1;
+}
- if (s < 0)
- s = socket(af, SOCK_STREAM | SOCK_NONBLOCK, IPPROTO_TCP);
+/**
+ * tcp_conn_new_sock() - Open and prepare new socket for connection
+ * @c: Execution context
+ * @af: Address family
+ *
+ * Return: socket number on success, negative code if socket creation failed
+ */
+static int tcp_conn_new_sock(const struct ctx *c, sa_family_t af)
+{
+ int s;
+
+ s = socket(af, SOCK_STREAM | SOCK_NONBLOCK, IPPROTO_TCP);
if (s > SOCKET_MAX) {
close(s);
@@ -1936,6 +1947,7 @@ static void tcp_conn_from_tap(struct ctx *c, int af, const void *addr,
const struct tcphdr *th, const char *opts,
size_t optlen, const struct timespec *now)
{
+ int *pool = af == AF_INET6 ? init_sock_pool6 : init_sock_pool4;
struct sockaddr_in addr4 = {
.sin_family = AF_INET,
.sin_port = th->dest,
@@ -1954,8 +1966,9 @@ static void tcp_conn_from_tap(struct ctx *c, int af, const void *addr,
if (c->tcp.conn_count >= TCP_MAX_CONNS)
return;
- if ((s = tcp_conn_new_sock(c, af)) < 0)
- return;
+ if ((s = tcp_conn_pool_sock(pool)) < 0)
+ if ((s = tcp_conn_new_sock(c, af)) < 0)
+ return;
if (!c->no_map_gw) {
if (af == AF_INET && IN4_ARE_ADDR_EQUAL(addr, &c->ip4.gw))
@@ -3016,20 +3029,10 @@ void tcp_sock_refill_pool(const struct ctx *c, int pool[], int af)
int i;
for (i = 0; i < TCP_SOCK_POOL_SIZE; i++) {
- int *s = &pool[i];
-
- if (*s >= 0)
+ if (pool[i] >= 0)
break;
- *s = socket(af, SOCK_STREAM | SOCK_NONBLOCK, IPPROTO_TCP);
- if (*s > SOCKET_MAX) {
- close(*s);
- *s = -1;
- return;
- }
-
- if (*s >= 0)
- tcp_sock_set_bufsize(c, *s);
+ pool[i] = tcp_conn_new_sock(c, af);
}
}