[PATCH 22/24] tcp, tcp_splice: Use less awkward syntax to swap in/out sockets from pools

[Stefano Brivio <sbrivio@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1765 bytes --]

Signed-off-by: Stefano Brivio <sbrivio(a)redhat.com>
---
 tcp.c        |  9 ++++-----
 tcp_splice.c | 13 ++++++-------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/tcp.c b/tcp.c
index 3f61e6a..e0916e0 100644
--- a/tcp.c
+++ b/tcp.c
@@ -2031,13 +2031,12 @@ static uint32_t tcp_seq_init(struct ctx *c, int af, void *addr,
  */
 static int tcp_conn_new_sock(struct ctx *c, sa_family_t af)
 {
-	int *pool = af == AF_INET6 ? init_sock_pool6 : init_sock_pool4, i, s;
+	int *p = af == AF_INET6 ? init_sock_pool6 : init_sock_pool4, i, s = -1;
 
-	for (i = 0; i < TCP_SOCK_POOL_SIZE; i++, pool++) {
-		if ((s = *pool) >= 0) {
-			*pool = -1;
+	for (i = 0; i < TCP_SOCK_POOL_SIZE; i++, p++) {
+		SWAP(s, *p);
+		if (s >= 0)
 			break;
-		}
 	}
 
 	if (s < 0)
diff --git a/tcp_splice.c b/tcp_splice.c
index b7bdfc2..bcafd33 100644
--- a/tcp_splice.c
+++ b/tcp_splice.c
@@ -501,18 +501,17 @@ static int tcp_splice_new(struct ctx *c, struct tcp_splice_conn *conn,
 			  in_port_t port)
 {
 	struct tcp_splice_connect_ns_arg ns_arg = { c, conn, port, 0 };
-	int *sock_pool_p, i, s = -1;
+	int *p, i, s = -1;
 
 	if (bitmap_isset(c->tcp.port_to_tap, port))
-		sock_pool_p = CONN_V6(conn) ? ns_sock_pool6 : ns_sock_pool4;
+		p = CONN_V6(conn) ? ns_sock_pool6 : ns_sock_pool4;
 	else
-		sock_pool_p = CONN_V6(conn) ? init_sock_pool6 : init_sock_pool4;
+		p = CONN_V6(conn) ? init_sock_pool6 : init_sock_pool4;
 
-	for (i = 0; i < TCP_SOCK_POOL_SIZE; i++, sock_pool_p++) {
-		if ((s = *sock_pool_p) >= 0) {
-			*sock_pool_p = -1;
+	for (i = 0; i < TCP_SOCK_POOL_SIZE; i++, p++) {
+		SWAP(s, *p);
+		if (s >= 0)
 			break;
-		}
 	}
 
 	if (s < 0 && bitmap_isset(c->tcp.port_to_tap, port)) {
-- 
@@ -501,18 +501,17 @@ static int tcp_splice_new(struct ctx *c, struct tcp_splice_conn *conn,
 			  in_port_t port)
 {
 	struct tcp_splice_connect_ns_arg ns_arg = { c, conn, port, 0 };
-	int *sock_pool_p, i, s = -1;
+	int *p, i, s = -1;
 
 	if (bitmap_isset(c->tcp.port_to_tap, port))
-		sock_pool_p = CONN_V6(conn) ? ns_sock_pool6 : ns_sock_pool4;
+		p = CONN_V6(conn) ? ns_sock_pool6 : ns_sock_pool4;
 	else
-		sock_pool_p = CONN_V6(conn) ? init_sock_pool6 : init_sock_pool4;
+		p = CONN_V6(conn) ? init_sock_pool6 : init_sock_pool4;
 
-	for (i = 0; i < TCP_SOCK_POOL_SIZE; i++, sock_pool_p++) {
-		if ((s = *sock_pool_p) >= 0) {
-			*sock_pool_p = -1;
+	for (i = 0; i < TCP_SOCK_POOL_SIZE; i++, p++) {
+		SWAP(s, *p);
+		if (s >= 0)
 			break;
-		}
 	}
 
 	if (s < 0 && bitmap_isset(c->tcp.port_to_tap, port)) {
-- 
2.35.1