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 8102C5A026C for ; Wed, 16 Nov 2022 05:42:24 +0100 (CET) Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4NBr4R342Pz4xwv; Wed, 16 Nov 2022 15:42:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=201602; t=1668573735; bh=erP6FS4up5d710+p2U1VLJHIZNLLY7oMzIpOlxSpjrA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DNLNmr+0T6oq0fgr+EUbpbyftTJGnxe7Mlh51krzxIJsUUpHF0VoxzA27bojc9vQA VhTmHwLFI/uY4wfgRW/ymqcoBQb+S4mHGpmYP9FKkDzHujo8xbRkgSFhdZwwmzwj9f +8IPhBWP0JTX55UlEFQQJKuwwXWuLedWa3fV8kLs= From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH 22/32] tcp: Simplify tcp_hash_match() to take an inany_addr Date: Wed, 16 Nov 2022 15:42:02 +1100 Message-Id: <20221116044212.3876516-23-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221116044212.3876516-1-david@gibson.dropbear.id.au> References: <20221116044212.3876516-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: NYFPFURNB2656YTB7UFNMFTUTUP2D4CN X-Message-ID-Hash: NYFPFURNB2656YTB7UFNMFTUTUP2D4CN 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_hash_match() can take either an IPv4 (struct in_addr) or IPv6 (struct in6_addr) address. It has two different paths for each of those cases. However, its only caller has already constructed an equivalent inany representation of the address, so we can have tcp_hash_match take that directly and use a simpler comparison with the inany_equals() helper. Signed-off-by: David Gibson --- tcp.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/tcp.c b/tcp.c index ca7f295..f566060 100644 --- a/tcp.c +++ b/tcp.c @@ -1177,25 +1177,17 @@ static int tcp_opt_get(const char *opts, size_t len, uint8_t type_find, /** * tcp_hash_match() - Check if a connection entry matches address and ports * @conn: Connection entry to match against - * @af: Address family, AF_INET or AF_INET6 - * @addr: Remote address, pointer to in_addr or in6_addr + * @addr: Remote address * @tap_port: tap-facing port * @sock_port: Socket-facing port * * Return: 1 on match, 0 otherwise */ static int tcp_hash_match(const struct tcp_tap_conn *conn, - int af, const void *addr, + const union inany_addr *addr, in_port_t tap_port, in_port_t sock_port) { - const struct in_addr *a4 = inany_v4(&conn->addr); - - if (af == AF_INET && a4 && !memcmp(a4, addr, sizeof(*a4)) && - conn->tap_port == tap_port && conn->sock_port == sock_port) - return 1; - - if (af == AF_INET6 && - IN6_ARE_ADDR_EQUAL(&conn->addr.a6, addr) && + if (inany_equals(&conn->addr, addr) && conn->tap_port == tap_port && conn->sock_port == sock_port) return 1; @@ -1340,7 +1332,7 @@ static struct tcp_tap_conn *tcp_hash_lookup(const struct ctx *c, inany_from_af(&aany, af, addr); b = tcp_hash(c, &aany, tap_port, sock_port); for (conn = tc_hash[b]; conn; conn = conn_at_idx(conn->next_index)) { - if (tcp_hash_match(conn, af, addr, tap_port, sock_port)) + if (tcp_hash_match(conn, &aany, tap_port, sock_port)) return conn; } -- 2.38.1