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

Reuse workspace bit in struct server ->flags.

Browse Source
This commit is contained in:
Simon Kelley
2021-07-01 13:22:10 +01:00
parent 9d806c51c2
commit 4205e2ebcf
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/cache.c
View File

@@ -1602,18 +1602,18 @@ int cache_make_stat(struct txt_record *t)
case TXT_STAT_SERVERS: case TXT_STAT_SERVERS:
/* sum counts from different records for same server */ /* sum counts from different records for same server */
for (serv = daemon->servers; serv; serv = serv->next) for (serv = daemon->servers; serv; serv = serv->next)
serv->flags &= ~SERV_COUNTED; serv->flags &= ~SERV_MARK;
for (serv = daemon->servers; serv; serv = serv->next) for (serv = daemon->servers; serv; serv = serv->next)
if (!(serv->flags & SERV_COUNTED)) if (!(serv->flags & SERV_MARK))
{ {
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;
for (serv1 = serv; serv1; serv1 = serv1->next) for (serv1 = serv; serv1; serv1 = serv1->next)
if (!(serv1->flags & SERV_COUNTED) && sockaddr_isequal(&serv->addr, &serv1->addr)) if (!(serv1->flags & SERV_MARK) && sockaddr_isequal(&serv->addr, &serv1->addr))
{ {
serv1->flags |= SERV_COUNTED; serv1->flags |= SERV_MARK;
queries += serv1->queries; queries += serv1->queries;
failed_queries += serv1->failed_queries; failed_queries += serv1->failed_queries;
} }
@@ -1641,6 +1641,11 @@ int cache_make_stat(struct txt_record *t)
} }
t->txt = (unsigned char *)buff; t->txt = (unsigned char *)buff;
t->len = p - buff; t->len = p - buff;
/* clear our workspace, these bits are assumed zero elsewhere. */
for (serv = daemon->servers; serv; serv = serv->next)
serv->flags &= ~SERV_MARK;
return 1; return 1;
} }
@@ -1683,24 +1688,28 @@ void dump_cache(time_t now)
/* sum counts from different records for same server */ /* sum counts from different records for same server */
for (serv = daemon->servers; serv; serv = serv->next) for (serv = daemon->servers; serv; serv = serv->next)
serv->flags &= ~SERV_COUNTED; serv->flags &= ~SERV_MARK;
for (serv = daemon->servers; serv; serv = serv->next) for (serv = daemon->servers; serv; serv = serv->next)
if (!(serv->flags & SERV_COUNTED)) if (!(serv->flags & SERV_MARK))
{ {
int port; int port;
unsigned int queries = 0, failed_queries = 0; unsigned int queries = 0, failed_queries = 0;
for (serv1 = serv; serv1; serv1 = serv1->next) for (serv1 = serv; serv1; serv1 = serv1->next)
if (!(serv1->flags & SERV_COUNTED) && sockaddr_isequal(&serv->addr, &serv1->addr)) if (!(serv1->flags & SERV_MARK) && sockaddr_isequal(&serv->addr, &serv1->addr))
{ {
serv1->flags |= SERV_COUNTED; serv1->flags |= SERV_MARK;
queries += serv1->queries; queries += serv1->queries;
failed_queries += serv1->failed_queries; failed_queries += serv1->failed_queries;
} }
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"), daemon->addrbuff, port, queries, failed_queries);
} }
/* other code assumes these are left as zeros. */
for (serv = daemon->servers; serv; serv = serv->next)
serv->flags &= ~SERV_MARK;
if (option_bool(OPT_DEBUG) || option_bool(OPT_LOG)) if (option_bool(OPT_DEBUG) || option_bool(OPT_LOG))
{ {
struct crec *cache ; struct crec *cache ;

4
src/dnsmasq.h
View File

@@ -536,8 +536,8 @@ union mysockaddr {
#define SERV_FOR_NODOTS 32 /* server for names with no domain part only */ #define SERV_FOR_NODOTS 32 /* server for names with no domain part only */
#define SERV_WARNED_RECURSIVE 64 /* avoid warning spam */ #define SERV_WARNED_RECURSIVE 64 /* avoid warning spam */
#define SERV_FROM_DBUS 128 /* 1 if source is DBus */ #define SERV_FROM_DBUS 128 /* 1 if source is DBus */
#define SERV_MARK 256 /* for mark-and-delete */ #define SERV_MARK 256 /* for mark-and-delete and log code */
#define SERV_COUNTED 512 /* workspace for log code */ /* #define SERV_COUNTED 512 /* workspace for log code */
#define SERV_USE_RESOLV 1024 /* forward this domain in the normal way */ #define SERV_USE_RESOLV 1024 /* forward this domain in the normal way */
#define SERV_FROM_RESOLV 2048 /* 1 for servers from resolv, 0 for command line. */ #define SERV_FROM_RESOLV 2048 /* 1 for servers from resolv, 0 for command line. */
#define SERV_FROM_FILE 4096 /* read from --servers-file */ #define SERV_FROM_FILE 4096 /* read from --servers-file */