colin/passt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util, tcp: Add helper to display socket addresses

Browse Source 
When reporting errors, we sometimes want to show a relevant socket address.
Doing so by extracting the various relevant fields can be pretty awkward,
so introduce a sockaddr_ntop() helper to make it simpler.  For now we just
have one user in tcp.c, but I have further upcoming patches which can make
use of it.

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
2024-05-21 14:48:03 +10:00
committed by Stefano Brivio
parent 3ff3a8a467
commit 1a20370b36
3 changed files with 79 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tcp.c
View File

@@ -2758,6 +2758,7 @@ static void tcp_tap_conn_from_sock(struct ctx *c, in_port_t dstport,
void tcp_listen_handler(struct ctx *c, union epoll_ref ref,
const struct timespec *now)
{
char sastr[SOCKADDR_STRLEN];
union sockaddr_inany sa;
socklen_t sl = sizeof(sa);
union flow *flow;
@@ -2776,25 +2777,15 @@ void tcp_listen_handler(struct ctx *c, union epoll_ref ref,
if (IN4_IS_ADDR_UNSPECIFIED(addr) ||
IN4_IS_ADDR_BROADCAST(addr) ||
IN4_IS_ADDR_MULTICAST(addr) || port == 0) {
char str[INET_ADDRSTRLEN];
err("Invalid endpoint from TCP accept(): %s:%hu",
inet_ntop(AF_INET, addr, str, sizeof(str)), port);
goto cancel;
}
IN4_IS_ADDR_MULTICAST(addr) || port == 0)
goto bad_endpoint;
} else if (sa.sa_family == AF_INET6) {
const struct in6_addr *addr = &sa.sa6.sin6_addr;
in_port_t port = sa.sa6.sin6_port;
if (IN6_IS_ADDR_UNSPECIFIED(addr) ||
IN6_IS_ADDR_MULTICAST(addr) || port == 0) {
char str[INET6_ADDRSTRLEN];
err("Invalid endpoint from TCP accept(): %s:%hu",
inet_ntop(AF_INET6, addr, str, sizeof(str)), port);
goto cancel;
}
IN6_IS_ADDR_MULTICAST(addr) || port == 0)
goto bad_endpoint;
}
if (tcp_splice_conn_from_sock(c, ref.tcp_listen.pif,
@@ -2804,6 +2795,10 @@ void tcp_listen_handler(struct ctx *c, union epoll_ref ref,
tcp_tap_conn_from_sock(c, ref.tcp_listen.port, flow, s, &sa, now);
return;
bad_endpoint:
err("Invalid endpoint from TCP accept(): %s",
sockaddr_ntop(&sa, sastr, sizeof(sastr)));
cancel:
flow_alloc_cancel(flow);
}