dnspacket: Return ComboAddress for local and remote

diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc
index df8d34070beb2e2faac62ee4e12d6e16d480fabb..b6f0b818af20b9417be66b69dfa2b4380133a4a4 100644 (file)
--- 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 4f9a51a1a2c3ccb32ec68220432d06da8c7f8aec..bf5e785782f9db9e027c1004b3c335db5680347f 100644 (file)
--- 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;