mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tcp: Simplify tcp_hash_match() to take an inany_addr

Browse source 
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 <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2022-11-17 16:58:58 +11:00 committed by Stefano Brivio
parent eb050b5a19
commit 7114fc92eb
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tcp.c
View file

@ -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 * tcp_hash_match() - Check if a connection entry matches address and ports
* @conn: Connection entry to match against * @conn: Connection entry to match against
* @af: Address family, AF_INET or AF_INET6 * @addr: Remote address
* @addr: Remote address, pointer to in_addr or in6_addr
* @tap_port: tap-facing port * @tap_port: tap-facing port
* @sock_port: Socket-facing port * @sock_port: Socket-facing port
* *
* Return: 1 on match, 0 otherwise * Return: 1 on match, 0 otherwise
*/ */
static int tcp_hash_match(const struct tcp_tap_conn *conn, 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) in_port_t tap_port, in_port_t sock_port)
{ {
const struct in_addr *a4 = inany_v4(&conn->addr); if (inany_equals(&conn->addr, 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) &&
conn->tap_port == tap_port && conn->sock_port == sock_port) conn->tap_port == tap_port && conn->sock_port == sock_port)
return 1; return 1;
@ -1340,7 +1332,7 @@ static struct tcp_tap_conn *tcp_hash_lookup(const struct ctx *c,
inany_from_af(&aany, af, addr); inany_from_af(&aany, af, addr);
b = tcp_hash(c, &aany, tap_port, sock_port); b = tcp_hash(c, &aany, tap_port, sock_port);
for (conn = tc_hash[b]; conn; conn = conn_at_idx(conn->next_index)) { 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; return conn;
} }