diff options
| author | Simon Kelley <simon@thekelleys.org.uk> | 2022-01-11 21:56:40 +0000 |
|---|---|---|
| committer | Simon Kelley <simon@thekelleys.org.uk> | 2022-01-11 22:09:09 +0000 |
| commit | ff43d35aeef6178f7471c6f37e91845c9a72bd2f (patch) | |
| tree | 1c2dd5099fe8499eb93b9a40561f3709c96adeb4 | |
| parent | 70fca205be111ef09cbb1f7179ba8b77f2cec367 (diff) | |
| download | dnsmasq-ff43d35aeef6178f7471c6f37e91845c9a72bd2f.tar.gz | |
Log port numbers in server addresses when non-standard ports in use.
| -rw-r--r-- | src/cache.c | 14 | ||||
| -rw-r--r-- | src/forward.c | 20 |
2 files changed, 25 insertions, 9 deletions
diff --git a/src/cache.c b/src/cache.c index 246c3f2..90052a0 100644 --- a/src/cache.c +++ b/src/cache.c @@ -1951,12 +1951,13 @@ void log_query(unsigned int flags, char *name, union all_addr *addr, char *arg, char *source, *dest = arg; char *verb = "is"; char *extra = ""; + char portstring[7]; /* space for #<portnum> */ if (!option_bool(OPT_LOG)) return; /* build query type string if requested */ - if(type > 0) + if (!(flags & (F_SERVER | F_IPSET)) && type > 0) arg = querystr(arg, type); #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)) - 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 dest = arg; } diff --git a/src/forward.c b/src/forward.c index 563aa19..cd826ec 100644 --- a/src/forward.c +++ b/src/forward.c @@ -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) { 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 - 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, @@ -959,8 +967,8 @@ static void dnssec_validate(struct frec *forward, struct dns_header *header, set_outgoing_mark(orig, fd); #endif server_send_log(server, fd, header, nn, DUMP_SEC_QUERY, - F_NOEXTRA | F_DNSSEC, daemon->keyname, - "dnssec-query", STAT_ISEQUAL(status, STAT_NEED_KEY) ? T_DNSKEY : T_DS); + F_NOEXTRA | F_DNSSEC | F_SERVER, daemon->keyname, + STAT_ISEQUAL(status, STAT_NEED_KEY) ? "dnssec-query[DNSKEY]" : "dnssec-query[DS]", 0); server->queries++; 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; daemon->log_display_id = ++daemon->log_id; - log_query_mysockaddr(F_NOEXTRA | F_DNSSEC, keyname, &server->addr, - "dnssec-query", STAT_ISEQUAL(new_status, STAT_NEED_KEY) ? T_DNSKEY : T_DS); + log_query_mysockaddr(F_NOEXTRA | F_DNSSEC | F_SERVER, keyname, &server->addr, + 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); |