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

Extralog tweaks to get log-id right in a couple of odd cases.

Browse Source
This commit is contained in:
Simon Kelley
2024-11-03 23:40:43 +00:00
parent 467fbd1086
commit 498794ad85
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dump.c
View File

@@ -285,7 +285,7 @@ static void do_dump_packet(int mask, void *packet, size_t len,
(proto == IPPROTO_UDP && !read_write(daemon->dumpfd, (void *)&udp, sizeof(udp), 0)) || (proto == IPPROTO_UDP && !read_write(daemon->dumpfd, (void *)&udp, sizeof(udp), 0)) ||
!read_write(daemon->dumpfd, (void *)packet, len, 0)) !read_write(daemon->dumpfd, (void *)packet, len, 0))
my_syslog(LOG_ERR, _("failed to write packet dump")); my_syslog(LOG_ERR, _("failed to write packet dump"));
else if (option_bool(OPT_EXTRALOG)) else if (option_bool(OPT_EXTRALOG) && (mask & 0x00ff))
my_syslog(LOG_INFO, _("%u dumping packet %u mask 0x%04x"), daemon->log_display_id, ++packet_count, mask); my_syslog(LOG_INFO, _("%u dumping packet %u mask 0x%04x"), daemon->log_display_id, ++packet_count, mask);
else else
my_syslog(LOG_INFO, _("dumping packet %u mask 0x%04x"), ++packet_count, mask); my_syslog(LOG_INFO, _("dumping packet %u mask 0x%04x"), ++packet_count, mask);

7
src/forward.c
View File

@@ -1447,9 +1447,6 @@ void return_reply(time_t now, struct frec *forward, struct dns_header *header, s
if (src->fd != -1) if (src->fd != -1)
{ {
#ifdef HAVE_DUMPFILE
dump_packet_udp(DUMP_REPLY, daemon->packet, (size_t)nn, NULL, &src->source, src->fd);
#endif
send_from(src->fd, option_bool(OPT_NOWILD) || option_bool (OPT_CLEVERBIND), daemon->packet, nn, send_from(src->fd, option_bool(OPT_NOWILD) || option_bool (OPT_CLEVERBIND), daemon->packet, nn,
&src->source, &src->dest, src->iface); &src->source, &src->dest, src->iface);
@@ -1459,6 +1456,10 @@ void return_reply(time_t now, struct frec *forward, struct dns_header *header, s
daemon->log_source_addr = &src->source; daemon->log_source_addr = &src->source;
log_query(F_UPSTREAM, "query", NULL, "duplicate", 0); log_query(F_UPSTREAM, "query", NULL, "duplicate", 0);
} }
#ifdef HAVE_DUMPFILE
dump_packet_udp(DUMP_REPLY, daemon->packet, (size_t)nn, NULL, &src->source, src->fd);
#endif
} }
} }
} }