From 2199aa19f92415dc9ecdfafbd9c9ce08327f54b8 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Mon, 19 Apr 2021 10:09:40 +0200 Subject: [PATCH] rec: Use the correct ECS address when proxy-protocol is enabled --- pdns/pdns_recursor.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc index 72588567ac..278e084207 100644 --- a/pdns/pdns_recursor.cc +++ b/pdns/pdns_recursor.cc @@ -1620,7 +1620,7 @@ static void startDoResolve(void *p) #ifdef HAVE_FSTRM sr.setFrameStreamServers(t_frameStreamServers); #endif - sr.setQuerySource(dc->d_remote, g_useIncomingECS && !dc->d_ednssubnet.source.empty() ? boost::optional(dc->d_ednssubnet) : boost::none); + sr.setQuerySource(dc->d_source, g_useIncomingECS && !dc->d_ednssubnet.source.empty() ? boost::optional(dc->d_ednssubnet) : boost::none); sr.setQueryReceivedOverTCP(dc->d_tcp); bool tracedQuery=false; // we could consider letting Lua know about this too @@ -1735,7 +1735,7 @@ static void startDoResolve(void *p) if (wantsRPZ && appliedPolicy.d_kind != DNSFilterEngine::PolicyKind::NoAction) { - if (t_pdl && t_pdl->policyHitEventFilter(dc->d_remote, dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_tcp, appliedPolicy, dc->d_policyTags, sr.d_discardedPolicies)) { + if (t_pdl && t_pdl->policyHitEventFilter(dc->d_source, dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_tcp, appliedPolicy, dc->d_policyTags, sr.d_discardedPolicies)) { /* reset to no match */ appliedPolicy = DNSFilterEngine::Policy(); } -- 2.47.2