fastd/fastd
1
0
Fork 0
mirror of https://github.com/neocturne/fastd.git synced 2025-05-13 20:15:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: add support for printing IP addresses without port using %I

Browse source 
By setting the port to 0, the port is now hidden altogether instead of
printing `:0`.
This commit is contained in:
Matthias Schiffer 2024-12-30 00:31:09 +01:00
parent d03a0a1734
commit c1a07b3f2b
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/log.c
View file

@ -36,6 +36,8 @@ size_t fastd_snprint_peer_address(
char *buffer, size_t size, const fastd_peer_address_t *address, const char *iface, bool bind_address, char *buffer, size_t size, const fastd_peer_address_t *address, const char *iface, bool bind_address,
bool hide) { bool hide) {
char addr_buf[INET6_ADDRSTRLEN] = ""; char addr_buf[INET6_ADDRSTRLEN] = "";
uint16_t port;
size_t ret;
switch (address->sa.sa_family) { switch (address->sa.sa_family) {
case AF_UNSPEC: case AF_UNSPEC:
@ -45,32 +47,42 @@ size_t fastd_snprint_peer_address(
return snprintf_safe(buffer, size, "any"); return snprintf_safe(buffer, size, "any");
case AF_INET: case AF_INET:
port = ntohs(address->in.sin_port);
if (!bind_address && hide) if (!bind_address && hide)
return snprintf_safe(buffer, size, "[hidden]:%u", ntohs(address->in.sin_port)); ret = snprintf_safe(buffer, size, "[hidden]");
else if (inet_ntop(AF_INET, &address->in.sin_addr, addr_buf, sizeof(addr_buf))) else if (inet_ntop(AF_INET, &address->in.sin_addr, addr_buf, sizeof(addr_buf)))
return snprintf_safe(buffer, size, "%s:%u", addr_buf, ntohs(address->in.sin_port)); ret = snprintf_safe(buffer, size, "%s", addr_buf);
else else
return 0; return 0;
break;
case AF_INET6: case AF_INET6:
port = ntohs(address->in6.sin6_port);
if (!bind_address && hide) if (!bind_address && hide)
return snprintf_safe(buffer, size, "[hidden]:%u", ntohs(address->in6.sin6_port)); ret = snprintf_safe(buffer, size, "[hidden]");
if (inet_ntop(AF_INET6, &address->in6.sin6_addr, addr_buf, sizeof(addr_buf))) { if (inet_ntop(AF_INET6, &address->in6.sin6_addr, addr_buf, sizeof(addr_buf))) {
char ifname_buf[IFNAMSIZ]; char ifname_buf[IFNAMSIZ];
if (!iface && IN6_IS_ADDR_LINKLOCAL(&address->in6.sin6_addr)) if (!iface && IN6_IS_ADDR_LINKLOCAL(&address->in6.sin6_addr))
iface = if_indextoname(address->in6.sin6_scope_id, ifname_buf); iface = if_indextoname(address->in6.sin6_scope_id, ifname_buf);
if (iface) if (iface)
return snprintf_safe( ret = snprintf_safe(buffer, size, "[%s%%%s]", addr_buf, iface);
buffer, size, "[%s%%%s]:%u", addr_buf, iface, ntohs(address->in6.sin6_port));
else else
return snprintf_safe(buffer, size, "[%s]:%u", addr_buf, ntohs(address->in6.sin6_port)); ret = snprintf_safe(buffer, size, "[%s]", addr_buf);
} else } else
return 0; return 0;
break;
default: default:
exit_bug("unsupported address family"); exit_bug("unsupported address family");
} }
if (port)
ret += snprintf_safe(buffer + ret, size - ret, ":%u", port);
return ret;
} }
/** Creates a string representation of a peer */ /** Creates a string representation of a peer */