Changeset 1026

Timestamp:

04/12/07 22:50:53 (2 years ago)

Author:

ahu

Message:

fix escaped dots! Plus close debian bug 406462, 'm' stands for minutes, not months. Plus improve bindbackend query-logging

Files:

• trunk/pdns/pdns/backends/bind/bindbackend2.cc (modified) (7 diffs)
• trunk/pdns/pdns/backends/bind/bindbackend2.hh (modified) (2 diffs)
• trunk/pdns/pdns/dnsparser.cc (modified) (2 diffs)
• trunk/pdns/pdns/dnswriter.cc (modified) (3 diffs)
• trunk/pdns/pdns/rcpgenerator.cc (modified) (2 diffs)
• trunk/pdns/pdns/resolver.cc (modified) (2 diffs)
• trunk/pdns/pdns/zoneparser-tng.cc (modified) (3 diffs)

trunk/pdns/pdns/backends/bind/bindbackend2.cc

@@ -323 +323 @@
-void Bind2Backend::insert(shared_ptr<State> stage, int id, const string &qnameu, const QType &qtype, const string &content, int ttl=300, int prio=25)
-{
-  // XXXX WRONG WRONG WRONG REWRITE
-
-  BB2DomainInfo bb2 = stage->id_zone_map[id];
-  Bind2DNSRecord bdr;
@@ -761 +759 @@
-    d_handle.qname=qname.substr(0,qname.size()-domain.length()-1); // strip domain name
-
-  d_handle.parent=this;
-  d_handle.qtype=qtype;
-  d_handle.domain=qname.substr(qname.size()-domain.length());
@@ -777 +774 @@
-  }
-
-
+reference counted 
-  
-  if(d_handle.d_records->empty())
-    DLOG(L<<"Query with no results"<<endl);
-
+
-  pair<vector<Bind2DNSRecord>::const_iterator, vector<Bind2DNSRecord>::const_iterator> range;
-
@@ -796 +793 @@
-    d_handle.d_iter=range.first;
-    d_handle.d_end_iter=range.second;
+    d_handle.mustlog = mustlog;
+
-  }
-
@@ -803 +802 @@
-Bind2Backend::handle::handle()
-{
-
-
+
-}
-
@@ -859 +857 @@
-  r.priority=(d_iter)->priority;
-  d_iter++;
+  if(mustlog)
+    L<<Logger::Warning<<"Returning: "<< r.qtype.getName()<<" "<<r.content<<endl;
+
-
-  return true;
@@ -876 +877 @@
-  d_handle.d_qname_end=d_handle.d_records->end();   // iter now points to a vector of pointers to vector<BBResourceRecords>
-
-  d_handle.parent=this;
-  d_handle.id=id;
-  d_handle.d_list=true;

trunk/pdns/pdns/backends/bind/bindbackend2.hh

@@ -139 +139 @@
-    void reset()
-    {
-      parent=0;
-      d_records.reset();
-      qname.clear();
-
+
-    }
-
-    handle();
-
-    Bind2Backend *parent;
-
-    shared_ptr<vector<Bind2DNSRecord> > d_records;
@@ -161 +158 @@
-    string domain;
-    QType qtype;
+    bool mustlog;
+
-  private:
-    int count;
-    
-    bool get_normal(DNSResourceRecord &);
-    bool get_list(DNSResourceRecord &);

trunk/pdns/pdns/dnsparser.cc

@@ -406 +406 @@
-    unsigned char labellen=content.at(frompos++);
-
-    //    cerr<<"ret: '"<<ret<<"', Labellen: "<<(int)labellen<<endl;
-    if(!labellen) {
-      if(ret.empty())
@@ -418 +417 @@
-    }
-    else {
-
-
+
+
+
+
+
+
+
-      ret.append(1,'.');
-      frompos+=labellen;
-    }
-  }

trunk/pdns/pdns/dnswriter.cc

@@ -3 +3 @@
-#include "dnsparser.hh"
-#include <boost/tokenizer.hpp>
+#include <boost/algorithm/string.hpp>
-
-DNSPacketWriter::DNSPacketWriter(vector<uint8_t>& content, const string& qname, uint16_t  qtype, uint16_t qclass, uint8_t opcode)
@@ -144 +145 @@
-}
-
+typedef vector<pair<string::size_type, string::size_type> > parts_t;
+
+bool labeltokUnescape(parts_t& parts, const string& label)
+{
+  string::size_type epos = label.size(), lpos(0), pos;
+  bool unescapedSomething = false;
+  const char* ptr=label.c_str();
+
+  parts.clear();
+
+  for(pos = 0 ; pos < epos; ++pos) {
+    if(ptr[pos]=='\\') {
+      pos++;
+      unescapedSomething = true;
+      continue;
+    }
+    if(ptr[pos]=='.') {
+      parts.push_back(make_pair(lpos, pos));
+      lpos=pos+1;
+    }
+  }
+  
+  if(lpos < pos)
+    parts.push_back(make_pair(lpos, pos));
+  return unescapedSomething;
+}
+
-// this is the absolute hottest function in the pdns recursor 
-void DNSPacketWriter::xfrLabel(const string& label, bool compress)
-{
-  typedef vector<pair<unsigned int, unsigned int> > parts_t;
-  parts_t parts;
-vstringtok(parts, label, "."); // XXX FIXME this should deal with escaped .
+bool unescaped=labeltokUnescape(parts, label); 
-  
-  // d_stuff is amount of stuff that is yet to be written out - the dnsrecordheader for example
-  unsigned int pos=d_content.size() + d_record.size() + d_stuff; 
-
-
+
-  for(parts_t::const_iterator i=parts.begin(); i!=parts.end(); ++i) {
-//    cerr<<"chopped: '"<<chopped<<"'\n"
+chopped.assign(label.c_str() + i->first)
-    lmap_t::iterator li=d_labelmap.end();
-    // see if we've written out this domain before
@@ -170 +196 @@
-      d_labelmap.push_back(make_pair(chopped, pos));                       //  if untrue, we need to count - also, don't store offsets > 16384, won't work
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-  d_record.push_back(0);

trunk/pdns/pdns/rcpgenerator.cc

@@ -1 +1 @@
-/*
-    PowerDNS Versatile Database Driven Nameserver
-
+- 2007
-
-    This program is free software; you can redistribute it and/or modify
@@ -138 +138 @@
-      break;
-
-) 
+ && strptr[d_pos+1]!='.')  // leave the \. escape around
-      d_pos++;
-

trunk/pdns/pdns/resolver.cc

@@ -188 +188 @@
-  int res=select(d_sock+1,&rd,0,0,&timeout);
-
-
+ {
-    throw ResolverException("Timeout waiting for answer");
+  }
-  if(res<0)
-    throw ResolverException("Error waiting for answer: "+stringerror());
@@ -205 +206 @@
-  sendResolve(ip, domain, type);
-  try {
-struct sockaddr_in from
-sizeof(from
+ComboAddress from(ip)
+from.getSocklen(
-  }
-  catch(ResolverException &re) {

trunk/pdns/pdns/zoneparser-tng.cc

@@ -66 +66 @@
-  if(!isdigit(lc))
-    switch(lc) {
+    case 'M':
+      val*=60; // minutes, not months!
+      break;
-    case 'H':
-      val*=3600;
@@ -74 +77 @@
-    case 'W':
-      val*=3600*24*7;
-      break;
-    case 'M':
-      val*=3600*24*7*4;
-      break;
-    case 'Y': // ? :-)
@@ -352 +352 @@
-        rr.content+=soaparts[n];
-    }
+    break;
-  default:;
-  }