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

Count NXDOMAIN replies from each server.

Browse Source
This commit is contained in:
Simon Kelley
2022-09-15 22:29:44 +01:00
parent 7a74037267
commit 271790685a
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cache.c
View File

@@ -1664,18 +1664,19 @@ int cache_make_stat(struct txt_record *t)
{ {
char *new, *lenp; char *new, *lenp;
int port, newlen, bytes_avail, bytes_needed; int port, newlen, bytes_avail, bytes_needed;
unsigned int queries = 0, failed_queries = 0; unsigned int queries = 0, failed_queries = 0, nxdomain_replies = 0;
for (serv1 = serv; serv1; serv1 = serv1->next) for (serv1 = serv; serv1; serv1 = serv1->next)
if (!(serv1->flags & SERV_MARK) && sockaddr_isequal(&serv->addr, &serv1->addr)) if (!(serv1->flags & SERV_MARK) && sockaddr_isequal(&serv->addr, &serv1->addr))
{ {
serv1->flags |= SERV_MARK; serv1->flags |= SERV_MARK;
queries += serv1->queries; queries += serv1->queries;
failed_queries += serv1->failed_queries; failed_queries += serv1->failed_queries;
nxdomain_replies += serv1->nxdomain_replies;
} }
port = prettyprint_addr(&serv->addr, daemon->addrbuff); port = prettyprint_addr(&serv->addr, daemon->addrbuff);
lenp = p++; /* length */ lenp = p++; /* length */
bytes_avail = bufflen - (p - buff ); bytes_avail = bufflen - (p - buff );
bytes_needed = snprintf(p, bytes_avail, "%s#%d %u %u", daemon->addrbuff, port, queries, failed_queries); bytes_needed = snprintf(p, bytes_avail, "%s#%d %u %u %u", daemon->addrbuff, port, queries, failed_queries, nxdomain_replies);
if (bytes_needed >= bytes_avail) if (bytes_needed >= bytes_avail)
{ {
/* expand buffer if necessary */ /* expand buffer if necessary */
@@ -1745,16 +1746,18 @@ void dump_cache(time_t now)
if (!(serv->flags & SERV_MARK)) if (!(serv->flags & SERV_MARK))
{ {
int port; int port;
unsigned int queries = 0, failed_queries = 0; unsigned int queries = 0, failed_queries = 0, nxdomain_replies = 0;
for (serv1 = serv; serv1; serv1 = serv1->next) for (serv1 = serv; serv1; serv1 = serv1->next)
if (!(serv1->flags & SERV_MARK) && sockaddr_isequal(&serv->addr, &serv1->addr)) if (!(serv1->flags & SERV_MARK) && sockaddr_isequal(&serv->addr, &serv1->addr))
{ {
serv1->flags |= SERV_MARK; serv1->flags |= SERV_MARK;
queries += serv1->queries; queries += serv1->queries;
failed_queries += serv1->failed_queries; failed_queries += serv1->failed_queries;
nxdomain_replies += serv1->nxdomain_replies;
} }
port = prettyprint_addr(&serv->addr, daemon->addrbuff); port = prettyprint_addr(&serv->addr, daemon->addrbuff);
my_syslog(LOG_INFO, _("server %s#%d: queries sent %u, retried or failed %u"), daemon->addrbuff, port, queries, failed_queries); my_syslog(LOG_INFO, _("server %s#%d: queries sent %u, retried or failed %u, nxdomain replies %u"),
daemon->addrbuff, port, queries, failed_queries, nxdomain_replies);
} }
if (option_bool(OPT_DEBUG) || option_bool(OPT_LOG)) if (option_bool(OPT_DEBUG) || option_bool(OPT_LOG))

1
src/dbus.c
View File

@@ -685,6 +685,7 @@ static DBusMessage *dbus_get_server_metrics(DBusMessage* message)
add_dict_int(&dict_array, "port", port); add_dict_int(&dict_array, "port", port);
add_dict_int(&dict_array, "queries", serv->queries); add_dict_int(&dict_array, "queries", serv->queries);
add_dict_int(&dict_array, "failed_queries", serv->failed_queries); add_dict_int(&dict_array, "failed_queries", serv->failed_queries);
add_dict_int(&dict_array, "nxdomain", serv->nxdomain_replies);
if (strlen(serv->domain) != 0) if (strlen(serv->domain) != 0)
add_dict_entry(&dict_array, "domain", serv->domain); add_dict_entry(&dict_array, "domain", serv->domain);

2
src/dnsmasq.h
View File

@@ -586,7 +586,7 @@ struct server {
struct serverfd *sfd; struct serverfd *sfd;
int tcpfd, edns_pktsz; int tcpfd, edns_pktsz;
time_t pktsz_reduced; time_t pktsz_reduced;
unsigned int queries, failed_queries; unsigned int queries, failed_queries, nxdomain_replies;
time_t forwardtime; time_t forwardtime;
int forwardcount; int forwardcount;
#ifdef HAVE_LOOP #ifdef HAVE_LOOP

3
src/forward.c
View File

@@ -865,6 +865,9 @@ static size_t process_reply(struct dns_header *header, time_t now, struct server
n = add_pseudoheader(header, n, limit, daemon->edns_pktsz, EDNS0_OPTION_EDE, (unsigned char *)&swap, 2, do_bit, 1); n = add_pseudoheader(header, n, limit, daemon->edns_pktsz, EDNS0_OPTION_EDE, (unsigned char *)&swap, 2, do_bit, 1);
} }
if (RCODE(header) == NXDOMAIN)
server->nxdomain_replies++;
return n; return n;
} }