From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id BC4945A0082 for ; Fri, 4 Nov 2022 09:43:48 +0100 (CET) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4N3Z0W34RGz4xwl; Fri, 4 Nov 2022 19:43:39 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1667551419; bh=ROKKwLNQ852ejz+5rkVIE5J3/Hgi4g3JiosEXsEfD5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LrlKmUPI9nUYrJV7TfugQKnv99Vlp3NNhilMjgQib/ebKVDgKA5gw6usJQ46RvuWe 9l5iiK6YcvqIOj0NJzcqlZLnz/NefBq2NWxaChbzvM7f6QeH/NJVrcrQqRHH7qzJ4H UOn7DH4Yhumm6pEn68/rtSRk06MkHW5kJq6cNNTA= From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 09/10] tcp: Have tcp_seq_init() take its parameters from struct tcp_conn Date: Fri, 4 Nov 2022 19:43:32 +1100 Message-Id: <20221104084333.3761760-10-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221104084333.3761760-1-david@gibson.dropbear.id.au> References: <20221104084333.3761760-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: GUDGJYK5GHMXX5JLI5LQWWDQNWCDFZPY X-Message-ID-Hash: GUDGJYK5GHMXX5JLI5LQWWDQNWCDFZPY 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.3 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: tcp_seq_init() takes a number of parameters for the connection, but at every call site, these are already populated in the tcp_conn structure. Likewise we always store the result into the @seq_to_tap field. Use this to simplify tcp_seq_init(). Signed-off-by: David Gibson --- tcp.c | 43 +++++++++++++------------------------------ 1 file changed, 13 insertions(+), 30 deletions(-) diff --git a/tcp.c b/tcp.c index b9d0510..59e03ff 100644 --- a/tcp.c +++ b/tcp.c @@ -1999,17 +1999,11 @@ static void tcp_clamp_window(const struct ctx *c, struct tcp_conn *conn, /** * tcp_seq_init() - Calculate initial sequence number according to RFC 6528 * @c: Execution context - * @af: Address family, AF_INET or AF_INET6 - * @addr: Remote address, pointer to in_addr or in6_addr - * @dstport: Destination port, connection-wise, network order - * @srcport: Source port, connection-wise, network order + * @conn: TCP connection, with addr, sock_port and tap_port populated * @now: Current timestamp - * - * Return: initial TCP sequence */ -static uint32_t tcp_seq_init(const struct ctx *c, int af, const void *addr, - in_port_t dstport, in_port_t srcport, - const struct timespec *now) +static void tcp_seq_init(const struct ctx *c, struct tcp_conn *conn, + const struct timespec *now) { struct { struct in6_addr src; @@ -2017,19 +2011,17 @@ static uint32_t tcp_seq_init(const struct ctx *c, int af, const void *addr, struct in6_addr dst; in_port_t dstport; } __attribute__((__packed__)) in = { - .srcport = srcport, - .dstport = dstport, + .src = conn->addr, + .srcport = conn->tap_port, + .dstport = conn->sock_port, }; uint32_t ns, seq = 0; - if (af == AF_INET) { - struct in6_addr tmp; - encode_ip4mapped_ip6(&tmp, addr); - in.src = tmp; - encode_ip4mapped_ip6(&tmp, &c->ip4.addr); - in.dst = tmp; + if (CONN_V4(conn)) { + struct in6_addr v4mapped; + encode_ip4mapped_ip6(&v4mapped, &c->ip4.addr); + in.dst = v4mapped; } else { - in.src = *(struct in6_addr *)addr; in.dst = c->ip6.addr; } @@ -2038,7 +2030,7 @@ static uint32_t tcp_seq_init(const struct ctx *c, int af, const void *addr, ns = now->tv_sec * 1E9; ns += now->tv_nsec >> 5; /* 32ns ticks, overflows 32 bits every 137s */ - return seq + ns; + conn->seq_to_tap = seq + ns; } /** @@ -2199,7 +2191,7 @@ static void tcp_conn_from_tap(struct ctx *c, int af, const void *addr, conn->seq_from_tap = conn->seq_init_from_tap + 1; conn->seq_ack_to_tap = conn->seq_from_tap; - conn->seq_to_tap = tcp_seq_init(c, af, addr, th->dest, th->source, now); + tcp_seq_init(c, conn, now); conn->seq_ack_from_tap = conn->seq_to_tap + 1; tcp_hash_insert(c, conn); @@ -2855,11 +2847,6 @@ static void tcp_conn_from_sock(struct ctx *c, union epoll_ref ref, conn->sock_port = ntohs(sa6.sin6_port); conn->tap_port = ref.r.p.tcp.tcp.index; - - conn->seq_to_tap = tcp_seq_init(c, AF_INET6, &sa6.sin6_addr, - conn->sock_port, - conn->tap_port, - now); } else { struct sockaddr_in sa4; @@ -2874,13 +2861,9 @@ static void tcp_conn_from_sock(struct ctx *c, union epoll_ref ref, conn->sock_port = ntohs(sa4.sin_port); conn->tap_port = ref.r.p.tcp.tcp.index; - - conn->seq_to_tap = tcp_seq_init(c, AF_INET, &sa4.sin_addr, - conn->sock_port, - conn->tap_port, - now); } + tcp_seq_init(c, conn, now); tcp_hash_insert(c, conn); conn->seq_ack_from_tap = conn->seq_to_tap + 1; -- 2.38.1