From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Tue, 2 Jul 2024 20:19:34 +0000 (+0200)
Subject: Cleanup dnspacket.cc
X-Git-Tag: rec-5.2.0-alpha1~199^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6af64817f2f25fdb2115fa838a7fb5ca6e9fbe9;p=thirdparty%2Fpdns.git

Cleanup dnspacket.cc
---

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index b18da82c7b..471af2a46e 100644
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -112,9 +112,7 @@ ComboAddress DNSPacket::getRemote() const
 
 ComboAddress DNSPacket::getInnerRemote() const
 {
-  if (d_inner_remote)
-    return *d_inner_remote;
-  return d_remote;
+  return d_inner_remote ? *d_inner_remote : d_remote;
 }
 
 uint16_t DNSPacket::getRemotePort() const
@@ -708,14 +706,12 @@ bool DNSPacket::hasValidEDNSCookie() const
 
 Netmask DNSPacket::getRealRemote() const
 {
-  if(d_haveednssubnet)
-    return d_eso.source;
-  return Netmask(getInnerRemote());
+  return d_haveednssubnet ? d_eso.source : Netmask{getInnerRemote()};
 }
 
 void DNSPacket::setSocket(Utility::sock_t sock)
 {
-  d_socket=sock;
+  d_socket = sock;
 }
 
 void DNSPacket::commitD()