]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch
Merge remote-tracking branch 'mfischer/slang' into next
[people/pmueller/ipfire-2.x.git] / src / patches / dnsmasq / 0029-Log-port-of-requestor-when-doing-extra-logging.patch
1 From 9f79ee4ae34886c0319f06d8f162b81ef79d62fb Mon Sep 17 00:00:00 2001
2 From: Simon Kelley <simon@thekelleys.org.uk>
3 Date: Mon, 12 Jan 2015 20:18:18 +0000
4 Subject: [PATCH 29/98] Log port of requestor when doing extra logging.
5
6 ---
7 src/cache.c | 6 +++---
8 1 file changed, 3 insertions(+), 3 deletions(-)
9
10 diff --git a/src/cache.c b/src/cache.c
11 index 945be071a0b6..09b6dbf8087a 100644
12 --- a/src/cache.c
13 +++ b/src/cache.c
14 @@ -1642,11 +1642,11 @@ void log_query(unsigned int flags, char *name, struct all_addr *addr, char *arg)
15
16 if (option_bool(OPT_EXTRALOG))
17 {
18 - prettyprint_addr(daemon->log_source_addr, daemon->addrbuff2);
19 + int port = prettyprint_addr(daemon->log_source_addr, daemon->addrbuff2);
20 if (flags & F_NOEXTRA)
21 - my_syslog(LOG_INFO, "* %s %s %s %s %s", daemon->addrbuff2, source, name, verb, dest);
22 + my_syslog(LOG_INFO, "* %s/%u %s %s %s %s", daemon->addrbuff2, port, source, name, verb, dest);
23 else
24 - my_syslog(LOG_INFO, "%u %s %s %s %s %s", daemon->log_display_id, daemon->addrbuff2, source, name, verb, dest);
25 + my_syslog(LOG_INFO, "%u %s/%u %s %s %s %s", daemon->log_display_id, daemon->addrbuff2, port, source, name, verb, dest);
26 }
27 else
28 my_syslog(LOG_INFO, "%s %s %s %s", source, name, verb, dest);
29 --
30 2.1.0
31