From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id 38E2E5A026D for ; Mon, 29 Jan 2024 05:36:09 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1706502959; bh=R30MbrGLERpft1VcoYWE9HbRhu6LJD0yEPYCYrDryuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LMAV61/+SdSKcxINpSvjAEmdFqA1lNipFaHQ3u3djn01YqtIWkJR6SVBvZ1NbThG2 fwB3GsKPQNKul58MI5/gapGC+vgdSYsL7riFxuogsH4O1f+dNgZaXr8jHscXHcuxm7 6w9YmU8Pb33+lReYTBYBnzyG6lFzHt53sl96U07z8QPKkoRnD1Z20GK5kBrsqg4I4q WI0hUyvmJiPzubO8op5PqDr0RJ8hMmX9HAhfm7CxX6zNTf1mi0aLXh25lc8QAEHeqT 0wCaE0lf/CDO3H75V3dS4JxhsFYMeyebmdK+bx9jsYW+3J+kNuSbPfD4Y67jI79o7b 1IK2mJ3EwrrEw== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4TNb8b66G6z4x3w; Mon, 29 Jan 2024 15:35:59 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH 09/16] tcp_splice: Merge tcp_splice_new() into its caller Date: Mon, 29 Jan 2024 15:35:50 +1100 Message-ID: <20240129043557.823451-10-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129043557.823451-1-david@gibson.dropbear.id.au> References: <20240129043557.823451-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 5JL3UA7J32ME7JKC2ZV2MDE2K4ZMV3WG X-Message-ID-Hash: 5JL3UA7J32ME7JKC2ZV2MDE2K4ZMV3WG X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The only caller of tcp_splice_new() is tcp_splice_conn_from_sock(). Both are quite short, and the division of responsibilities between the two isn't particularly obvious. Simplify by merging the former into the latter. Signed-off-by: David Gibson --- tcp_splice.c | 60 ++++++++++++++++++++-------------------------------- 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/tcp_splice.c b/tcp_splice.c index eee98a30..30b4d58a 100644 --- a/tcp_splice.c +++ b/tcp_splice.c @@ -368,41 +368,6 @@ static int tcp_splice_connect(const struct ctx *c, struct tcp_splice_conn *conn, return 0; } -/** - * tcp_splice_new() - Handle new spliced connection - * @c: Execution context - * @conn: Connection pointer - * @port: Destination port, host order - * @pif: Originating pif of the splice - * - * Return: return code from connect() - */ -static int tcp_splice_new(const struct ctx *c, struct tcp_splice_conn *conn, - in_port_t dstport, uint8_t pif) -{ - sa_family_t af = CONN_V6(conn) ? AF_INET6 : AF_INET; - int s1; - - if (pif == PIF_SPLICE) { - dstport += c->tcp.fwd_out.delta[dstport]; - - s1 = tcp_conn_sock(c, af); - } else { - ASSERT(pif == PIF_HOST); - - dstport += c->tcp.fwd_in.delta[dstport]; - - s1 = tcp_conn_sock_ns(c, af); - } - - if (s1 < 0) { - warn("Couldn't open connectable socket for splice (%d)", s1); - return s1; - } - - return tcp_splice_connect(c, conn, s1, dstport); -} - /** * tcp_splice_conn_from_sock() - Attempt to init state for a spliced connection * @c: Execution context @@ -419,8 +384,10 @@ bool tcp_splice_conn_from_sock(const struct ctx *c, struct tcp_splice_conn *conn, int s0, const struct sockaddr *sa) { + in_port_t srcport, dstport = ref.port; union inany_addr src; - in_port_t srcport; + sa_family_t af; + int s1; ASSERT(c->mode == MODE_PASTA); @@ -429,6 +396,7 @@ bool tcp_splice_conn_from_sock(const struct ctx *c, return false; conn->flags = inany_v4(&src) ? 0 : SPLICE_V6; + af = CONN_V6(conn) ? AF_INET6 : AF_INET; if (setsockopt(s0, SOL_TCP, TCP_QUICKACK, &((int){ 1 }), sizeof(int))) flow_trace(conn, "failed to set TCP_QUICKACK on %i", s0); @@ -439,7 +407,25 @@ bool tcp_splice_conn_from_sock(const struct ctx *c, conn->pipe[0][0] = conn->pipe[0][1] = -1; conn->pipe[1][0] = conn->pipe[1][1] = -1; - if (tcp_splice_new(c, conn, ref.port, ref.pif)) + if (ref.pif == PIF_SPLICE) { + dstport += c->tcp.fwd_out.delta[dstport]; + + s1 = tcp_conn_sock(c, af); + } else { + ASSERT(ref.pif == PIF_HOST); + + dstport += c->tcp.fwd_in.delta[dstport]; + + s1 = tcp_conn_sock_ns(c, af); + } + + if (s1 < 0) { + warn("Couldn't open connectable socket for splice (%d)", s1); + conn_flag(c, conn, CLOSING); + return true; + } + + if (tcp_splice_connect(c, conn, s1, dstport)) conn_flag(c, conn, CLOSING); return true; -- 2.43.0