diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-03-09 22:54:06 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2013-03-09 22:54:06 +0100 |
| commit | 631c13d2473e475096c77f129282671711c379bb (patch) | |
| tree | 46271e037bcf2041f9e3156389a919d3f348e35a /src/printf.c | |
| parent | ec8109fa53082d242459893373f009e27f6732df (diff) | |
| download | fastd-631c13d2473e475096c77f129282671711c379bb.tar fastd-631c13d2473e475096c77f129282671711c379bb.zip | |
Add options to hide IP and MAC addresses from log output
Diffstat (limited to 'src/printf.c')
| -rw-r--r-- | src/printf.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/printf.c b/src/printf.c index bd06727..d5f47ee 100644 --- a/src/printf.c +++ b/src/printf.c @@ -50,12 +50,16 @@ static int snprint_peer_address(const fastd_context_t *ctx, char *buffer, size_t return snprintf(buffer, size, "any"); case AF_INET: - if (inet_ntop(AF_INET, &address->in.sin_addr, addr_buf, sizeof(addr_buf))) + if (!bind_address && ctx->conf->hide_ip_addresses) + return snprintf_safe(buffer, size, "[hidden]:%u", ntohs(address->in.sin_port)); + 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)); else return 0; case AF_INET6: + if (!bind_address && ctx->conf->hide_ip_addresses) + return snprintf_safe(buffer, size, "[hidden]:%u", ntohs(address->in.sin_port)); if (inet_ntop(AF_INET6, &address->in6.sin6_addr, addr_buf, sizeof(addr_buf))) return snprintf_safe(buffer, size, "[%s]:%u", addr_buf, ntohs(address->in6.sin6_port)); else @@ -121,9 +125,12 @@ int fastd_vsnprintf(const fastd_context_t *ctx, char *buffer, size_t size, const eth_addr = va_arg(ap, const fastd_eth_addr_t*); if (eth_addr) { - buffer += snprintf_safe(buffer, buffer_end-buffer, "%02x:%02x:%02x:%02x:%02x:%02x", - eth_addr->data[0], eth_addr->data[1], eth_addr->data[2], - eth_addr->data[3], eth_addr->data[4], eth_addr->data[5]); + if (ctx->conf->hide_mac_addresses) + buffer += snprintf_safe(buffer, buffer_end-buffer, "[hidden]"); + else + buffer += snprintf_safe(buffer, buffer_end-buffer, "%02x:%02x:%02x:%02x:%02x:%02x", + eth_addr->data[0], eth_addr->data[1], eth_addr->data[2], + eth_addr->data[3], eth_addr->data[4], eth_addr->data[5]); } else { buffer += snprintf_safe(buffer, buffer_end-buffer, "(null)"); |