From: Aki Tuomi <cmouse@cmouse.fi>
Date: Sun, 26 Jun 2016 17:17:06 +0000 (+0300)
Subject: dnspacket: Return ComboAddress for local and remote
X-Git-Tag: auth-4.0.1~36^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9b4da23db8c8e1cafd58ae4c52e85dcc957c5fc;p=thirdparty%2Fpdns.git

dnspacket: Return ComboAddress for local and remote
---

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index df8d34070b..b6f0b818af 100644
--- a/pdns/dnspacket.cc
+++ b/pdns/dnspacket.cc
@@ -81,9 +81,9 @@ const string& DNSPacket::getString()
   return d_rawpacket;
 }
 
-string DNSPacket::getRemote() const
+ComboAddress DNSPacket::getRemote() const
 {
-  return d_remote.toString();
+  return d_remote;
 }
 
 uint16_t DNSPacket::getRemotePort() const
diff --git a/pdns/dnspacket.hh b/pdns/dnspacket.hh
index 4f9a51a1a2..bf5e785782 100644
--- a/pdns/dnspacket.hh
+++ b/pdns/dnspacket.hh
@@ -73,14 +73,14 @@ public:
 
   // address & socket manipulation
   void setRemote(const ComboAddress*);
-  string getRemote() const;
+  ComboAddress getRemote() const;
   Netmask getRealRemote() const;
-  string getLocal() const
+  ComboAddress getLocal() const
   {
     ComboAddress ca;
     socklen_t len=sizeof(ca);
     getsockname(d_socket, (sockaddr*)&ca, &len);
-    return ca.toString();
+    return ca;
   }
   uint16_t getRemotePort() const;