Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log port numbers in server addresses when non-standard ports in use.

Browse Source
This commit is contained in:
Simon Kelley
2022-01-11 21:56:40 +00:00
parent 70fca205be
commit ff43d35aee
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/cache.c
View File

@@ -1951,12 +1951,13 @@ void log_query(unsigned int flags, char *name, union all_addr *addr, char *arg,
char *source, *dest = arg; char *source, *dest = arg;
char *verb = "is"; char *verb = "is";
char *extra = ""; char *extra = "";
char portstring[7]; /* space for #<portnum> */
if (!option_bool(OPT_LOG)) if (!option_bool(OPT_LOG))
return; return;
/* build query type string if requested */ /* build query type string if requested */
if(type > 0) if (!(flags & (F_SERVER | F_IPSET)) && type > 0)
arg = querystr(arg, type); arg = querystr(arg, type);
#ifdef HAVE_DNSSEC #ifdef HAVE_DNSSEC
@@ -1992,8 +1993,15 @@ void log_query(unsigned int flags, char *name, union all_addr *addr, char *arg,
} }
} }
else if (flags & (F_IPV4 | F_IPV6)) else if (flags & (F_IPV4 | F_IPV6))
inet_ntop(flags & F_IPV4 ? AF_INET : AF_INET6, {
addr, daemon->addrbuff, ADDRSTRLEN); inet_ntop(flags & F_IPV4 ? AF_INET : AF_INET6,
addr, daemon->addrbuff, ADDRSTRLEN);
if ((flags & F_SERVER) && type != NAMESERVER_PORT)
{
extra = portstring;
sprintf(portstring, "#%u", type);
}
}
else else
dest = arg; dest = arg;
} }

20
src/forward.c
View File

@@ -123,9 +123,17 @@ static void set_outgoing_mark(struct frec *forward, int fd)
static void log_query_mysockaddr(unsigned int flags, char *name, union mysockaddr *addr, char *arg, unsigned short type) static void log_query_mysockaddr(unsigned int flags, char *name, union mysockaddr *addr, char *arg, unsigned short type)
{ {
if (addr->sa.sa_family == AF_INET) if (addr->sa.sa_family == AF_INET)
log_query(flags | F_IPV4, name, (union all_addr *)&addr->in.sin_addr, arg, type); {
if (flags & F_SERVER)
type = ntohs(addr->in.sin_port);
log_query(flags | F_IPV4, name, (union all_addr *)&addr->in.sin_addr, arg, type);
}
else else
log_query(flags | F_IPV6, name, (union all_addr *)&addr->in6.sin6_addr, arg, type); {
if (flags & F_SERVER)
type = ntohs(addr->in6.sin6_port);
log_query(flags | F_IPV6, name, (union all_addr *)&addr->in6.sin6_addr, arg, type);
}
} }
static void server_send(struct server *server, int fd, static void server_send(struct server *server, int fd,
@@ -959,8 +967,8 @@ static void dnssec_validate(struct frec *forward, struct dns_header *header,
set_outgoing_mark(orig, fd); set_outgoing_mark(orig, fd);
#endif #endif
server_send_log(server, fd, header, nn, DUMP_SEC_QUERY, server_send_log(server, fd, header, nn, DUMP_SEC_QUERY,
F_NOEXTRA | F_DNSSEC, daemon->keyname, F_NOEXTRA | F_DNSSEC | F_SERVER, daemon->keyname,
"dnssec-query", STAT_ISEQUAL(status, STAT_NEED_KEY) ? T_DNSKEY : T_DS); STAT_ISEQUAL(status, STAT_NEED_KEY) ? "dnssec-query[DNSKEY]" : "dnssec-query[DS]", 0);
server->queries++; server->queries++;
return; return;
} }
@@ -1882,8 +1890,8 @@ static int tcp_key_recurse(time_t now, int status, struct dns_header *header, si
log_save = daemon->log_display_id; log_save = daemon->log_display_id;
daemon->log_display_id = ++daemon->log_id; daemon->log_display_id = ++daemon->log_id;
log_query_mysockaddr(F_NOEXTRA | F_DNSSEC, keyname, &server->addr, log_query_mysockaddr(F_NOEXTRA | F_DNSSEC | F_SERVER, keyname, &server->addr,
"dnssec-query", STAT_ISEQUAL(new_status, STAT_NEED_KEY) ? T_DNSKEY : T_DS); STAT_ISEQUAL(status, STAT_NEED_KEY) ? "dnssec-query[DNSKEY]" : "dnssec-query[DS]", 0);
new_status = tcp_key_recurse(now, new_status, new_header, m, class, name, keyname, server, have_mark, mark, keycount); new_status = tcp_key_recurse(now, new_status, new_header, m, class, name, keyname, server, have_mark, mark, keycount);