DNSName: fix dnsgram.cc and anadns.hh

diff --git a/pdns/anadns.hh b/pdns/anadns.hh
index 7eb1a5b44e30da376e4489e99a02ba408f36415a..1a20ca4682b7f1b56c93fe6141fc1bd72da64203 100644 (file)
--- a/pdns/anadns.hh
+++ b/pdns/anadns.hh
@@ -42,14 +42,14 @@ struct QuestionIdentifier
 
   ComboAddress d_source, d_dest;
 
-  string d_qname;
+  DNSName d_qname;
   uint16_t d_qtype;
   uint16_t d_id;
 };
 
 inline ostream& operator<<(ostream &s, const QuestionIdentifier& qi) 
 {
-  s<< "'"<<qi.d_qname<<"|"<<DNSRecordContent::NumberToType(qi.d_qtype)<<"', with id " << qi.d_id <<" from "<<qi.d_source.toStringWithPort();
+  s<< "'"<<qi.d_qname.toString()<<"|"<<DNSRecordContent::NumberToType(qi.d_qtype)<<"', with id " << qi.d_id <<" from "<<qi.d_source.toStringWithPort();
   
   s<<" to " << qi.d_dest.toStringWithPort();
   return s;

diff --git a/pdns/dnsgram.cc b/pdns/dnsgram.cc
index 0ab2255593e77f25f6b159383f2ace41587ca43e..ef89ae291c868b934662edd942304357eb470997 100644 (file)
--- a/pdns/dnsgram.cc
+++ b/pdns/dnsgram.cc
@@ -8,7 +8,6 @@
 #include "dnsparser.hh"
 #include <boost/tuple/tuple.hpp>
 #include <boost/tuple/tuple_comparison.hpp>
-#include <boost/algorithm/string.hpp>
 #include <map>
 #include <set>
 #include <fstream>
@@ -102,12 +101,12 @@ try
     
     struct pdns_timeval lastreport={0, 0};
     
-    typedef set<pair<string, uint16_t> > queries_t;
+    typedef set<pair<DNSName, uint16_t> > queries_t;
     queries_t questions, answers;
 
     //    unsigned int count = 50000;
     
-    map<pair<string, uint16_t>, int> counts;
+    map<pair<DNSName, uint16_t>, int> counts;
 
     map<double, int> rdqcounts, rdacounts;
 
@@ -191,7 +190,7 @@ try
     ofstream failed("failed");
     failed<<"name\ttype\tnumber\n";
     for(diff_t::const_iterator i = diff.begin(); i != diff.end() ; ++i) {
-      failed << i->first << "\t" << DNSRecordContent::NumberToType(i->second) << "\t"<< counts[make_pair(i->first, i->second)]<<"\n";
+      failed << i->first.toString() << "\t" << DNSRecordContent::NumberToType(i->second) << "\t"<< counts[make_pair(i->first, i->second)]<<"\n";
     }
 
     diff.clear();
@@ -203,7 +202,7 @@ try
     ofstream succeeded("succeeded");
     succeeded<<"name\ttype\tnumber\n";
     for(queries_t::const_iterator i = answers.begin(); i != answers.end() ; ++i) {
-      succeeded << i->first << "\t" <<DNSRecordContent::NumberToType(i->second) << "\t" << counts[make_pair(i->first, i->second)]<<"\n";
+      succeeded << i->first.toString() << "\t" <<DNSRecordContent::NumberToType(i->second) << "\t" << counts[make_pair(i->first, i->second)]<<"\n";
     }
   }
 }