[Dnsmasq-discuss] [PATCH] Log upstream port for dnssec-retry

[Geert Stappers]

On Sun, Apr 10, 2022 at 10:46:58AM +0200, Dominik Derigs wrote:
> Dear Simon et al.,
> 
> The current version of dnsmasq logs the upstream port like
> 
> > Feb 21 22:02:18 dnsmasq[8991]: dnssec-query[DS] microsoft.net
> to 127.0.0.1#5053
> 
> when sending queries upstream. However, it is missing for dnssec-
> retry like
> 
> > Feb 21 22:02:18 dnsmasq[8991]: dnssec-retry[DS] microsoft.net
> to 127.0.0.1
> 
> This is added by this patch implementing it in the same way as
> used already when logging "dnssec-query" in the code.
> 
> Best,
> Dominik

> From 00b8789e4119a25da7f286ca1cefd5fe66383b30 Mon Sep 17 00:00:00 2001
> From: Dominik Derigs <dl6er at dl6er.de>
> Date: Sat, 2 Apr 2022 21:45:47 +0200
> Subject: [PATCH] Also log upstream port for dnssec-retry
> 
> Signed-off-by: DL6ER <dl6er at dl6er.de>

Regarding these three lines
| Subject: [PATCH] Also log upstream port for dnssec-retry
| 
| Signed-off-by: DL6ER <dl6er at dl6er.de>


There is only the commit summary,
there should be more text about the why.

> ---
>  src/forward.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/forward.c b/src/forward.c
> index c17541b..b522c1f 100644
> --- a/src/forward.c
> +++ b/src/forward.c
> @@ -527,8 +527,8 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr,
>  		}
>  #ifdef HAVE_DNSSEC
>  	      else
> -		log_query_mysockaddr(F_NOEXTRA | F_DNSSEC, daemon->namebuff, &srv->addr,
> -				     "dnssec-retry", (forward->flags & FREC_DNSKEY_QUERY) ? T_DNSKEY : T_DS);
> +		log_query_mysockaddr(F_NOEXTRA | F_DNSSEC | F_SERVER, daemon->namebuff, &srv->addr,
> +				     (forward->flags & FREC_DNSKEY_QUERY) ? "dnssec-retry[DNSKEY]" : "dnssec-retry[DS]", 0);

I see more changes as commit message says.


>  #endif
>  
>  	      srv->queries++;
> -- 


Groeten
Geert Stappers
-- 
Silence is hard to parse