Changeset 230

Timestamp:

02/04/04 23:41:17 (9 years ago)

Author:

ahu

Message:

timeout addition to qgen
added uitoa for negative serials in soa

Location:

trunk/pdns/pdns

Files:

• dnspacket.cc (modified) (2 diffs)
• misc.cc (modified) (1 diff)
• misc.hh (modified) (1 diff)
• qgen.cc (modified) (7 diffs)

trunk/pdns/pdns/dnspacket.cc

@@ -17 +17 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-// $Id: dnspacket.cc,v 1.23 2003/11/23 15:14:57 ahu Exp $
+// $Id: dnspacket.cc,v 1.24 2004/02/04 22:41:17 ahu Exp $
 #include "utility.hh"
 #include <cstdio>
@@ -1241 +1241 @@
       // SPARC alignment issues.
       
-      rr.content+=" ";rr.content+=itoa(getLong( datapos+offset    ));
-      rr.content+=" ";rr.content+=itoa(getLong( datapos+offset+4  ));
-      rr.content+=" ";rr.content+=itoa(getLong( datapos+offset+8  ));
-      rr.content+=" ";rr.content+=itoa(getLong( datapos+offset+12 ));
-      rr.content+=" ";rr.content+=itoa(getLong( datapos+offset+16 ));
+      rr.content+=" ";rr.content+=uitoa(getLong( datapos+offset    ));
+      rr.content+=" ";rr.content+=uitoa(getLong( datapos+offset+4  ));
+      rr.content+=" ";rr.content+=uitoa(getLong( datapos+offset+8  ));
+      rr.content+=" ";rr.content+=uitoa(getLong( datapos+offset+12 ));
+      rr.content+=" ";rr.content+=uitoa(getLong( datapos+offset+16 ));
 
       break;

trunk/pdns/pdns/misc.cc

@@ -256 +256 @@
 }
 
+string uitoa(unsigned int i) // MSVC 6 doesn't grok overloading (un)signed
+{
+  ostringstream o;
+  o<<i;
+  return o.str();
+}
+
+
 string stringerror()
 {

trunk/pdns/pdns/misc.hh

@@ -117 +117 @@
 string stringerror();
 string itoa(int i);
+string uitoa(unsigned int i);
 
 void dropPrivs(int uid, int gid);

trunk/pdns/pdns/qgen.cc

@@ -56 +56 @@
   unsigned int d_maxOutstanding;
   unsigned int d_maxToRead;
+  unsigned int d_timeout;
   unsigned int d_answeredOK;
   unsigned int d_delayed;
@@ -78 +79 @@
   void sendQuestion(const string& qname, QType qtype);
   QGen(const string &server, unsigned int port, const string &fileName,
-       unsigned int maxOutstanding, unsigned int maxBurst, unsigned int maxToRead);
+       unsigned int maxOutstanding, unsigned int maxBurst, unsigned int maxToRead, unsigned int timeout);
   void start();
 
@@ -95 +96 @@
            unsigned int maxOutstanding,
            unsigned int maxBurst,
-           unsigned int maxToRead) : d_in(fileName.c_str())
+           unsigned int maxToRead,
+           unsigned int timeout) : d_in(fileName.c_str())
 {
   d_answeredOK = d_numqueries = d_delayed = d_unmatched = d_servfail = d_nxdomain = 0;
@@ -105 +107 @@
   d_maxToRead = maxToRead;
   d_maxBurst=maxBurst;
+  d_timeout=timeout;
   struct in_addr inp;
   Utility::inet_aton(server.c_str(),&inp);
@@ -133 +136 @@
 
   for(multiset<OutstandingQuestion>::iterator i=d_questions.begin();i!=d_questions.end();) 
-    if(now-i->timeSent > 5) {
-      cout<<"No answer received to question for "<<i->qname<<endl;
-      cout<<i->qname<<" "<<i->qtype.getName()<<"NO ANSWER"<<endl;
+    if(now-i->timeSent > d_timeout) {
+      cerr<<"No answer received to question for "<<i->qname<<endl;
+      cout<<i->qname<<" "<<i->qtype.getName()<<" NO ANSWER"<<endl;
       d_unanswered.insert(*i);
       d_questions.erase(i++);
@@ -318 +321 @@
   at.add("max-outstanding",Numeric(),"200");
   at.add("max-questions",Numeric(),"0");
+  at.add("timeout",Numeric(),"30");
   at.parse(argc, argv);
   cout<<"hier 1"<<endl;
@@ -329 +333 @@
   unsigned int maxOutstanding=at.getInt("max-outstanding");
   unsigned int maxToRead=at.getInt("max-questions");
+  unsigned int timeout=at.getInt("timeout");
 
   // parse commandline here
 
-  QGen qg(server, port, fileName, maxOutstanding, maxBurst, maxToRead);
+  QGen qg(server, port, fileName, maxOutstanding, maxBurst, maxToRead, timeout);
   qg.start();