Changeset 979

Timestamp:

03/18/07 20:33:08 (6 years ago)

Author:

ahu

Message:

silence (correct) valgrind warning, plus add ComboAddress? 'toStringWithPort'

Location:

trunk/pdns/pdns

Files:

• iputils.hh (modified) (2 diffs)
• zoneparser-tng.cc (modified) (1 diff)

trunk/pdns/pdns/iputils.hh

@@ -35 +35 @@
 #include <boost/tuple/tuple.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
+#include <boost/lexical_cast.hpp>
 
 using namespace std;
@@ -162 +163 @@
       
     return tmp;
+  }
+
+  string toStringWithPort() const
+  {
+    if(sin4.sin_family==AF_INET)
+      return toString() + ":" + boost::lexical_cast<string>(ntohs(sin4.sin_port));
+    else
+      return "["+toString() + "]:" + boost::lexical_cast<string>(ntohs(sin4.sin_port));
   }
 };

trunk/pdns/pdns/zoneparser-tng.cc

@@ -89 +89 @@
 bool ZoneParserTNG::getTemplateLine()
 {
-  if(d_templatecounter > d_templatestop || d_templateparts.empty()) // no template, or done with
+  if(d_templateparts.empty() || d_templatecounter > d_templatestop) // no template, or done with
     return false;