Changeset 510

Timestamp:

10/08/05 18:12:49 (8 years ago)

Author:

ahu

Message:

fix double-srv regression test error
add label compression to dnswriter, make parser, string parser, sting generator ignore that
make mx, cname, ptr, ns, soa do label compression
fix string parser to not add a trailing . when no zone is configured for expansion
add some comments to DNSPacketWriter
add dnspbench to benchmark and test the new infrastructure away from sdig

new infra appears to generate 100.000 simple packets/s on 1.4GHz

remove a warning in misc.cc

Location:

trunk/pdns

Files:

• pdns/Makefile.am (modified) (2 diffs)
• pdns/dnsparser.hh (modified) (1 diff)
• pdns/dnspbench.cc (added)
• pdns/dnsrecords.cc (modified) (8 diffs)
• pdns/dnswriter.cc (modified) (7 diffs)
• pdns/dnswriter.hh (modified) (4 diffs)
• pdns/misc.cc (modified) (1 diff)
• pdns/rcpgenerator.cc (modified) (3 diffs)
• pdns/rcpgenerator.hh (modified) (2 diffs)
• pdns/sdig.cc (modified) (1 diff)
• regression-tests/double-srv/expected_result (modified) (1 diff)

trunk/pdns/pdns/Makefile.am

@@ -19 +19 @@
 bin_PROGRAMS = pdns_control  dnswasher dnsreplay 
 
-EXTRA_PROGRAMS=pdns_recursor sdig pdns_control qgen dnsscope dnsreplay_mindex
+EXTRA_PROGRAMS=pdns_recursor sdig dnspbench pdns_control qgen dnsscope dnsreplay_mindex
 
 pdns_server_SOURCES=dnspacket.cc nameserver.cc tcpreceiver.hh \
@@ -45 +45 @@
 sdig_SOURCES=sdig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh \
         misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh
+
+dnspbench_SOURCES=dnspbench.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh \
+        misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh
+
 
 qgen_SOURCES=resolver.cc resolver.hh misc.cc unix_utility.cc qtype.cc \

trunk/pdns/pdns/dnsparser.hh

@@ -112 +112 @@
 
 
-  void xfrLabel(string &label)
+  void xfrLabel(string &label, bool compress=false)
   {
     label=getLabel();

trunk/pdns/pdns/dnsrecords.cc

@@ -32 +32 @@
   static void report(void)
   {
-    regist(1,ns_t_aaaa,&make,"AAAA");
+    regist(1, ns_t_aaaa, &make, "AAAA");
   }
 
@@ -152 +152 @@
 
 
-boilerplate_conv(NS, ns_t_ns, conv.xfrLabel(d_content));
-boilerplate_conv(PTR, ns_t_ptr, conv.xfrLabel(d_content));
-boilerplate_conv(CNAME, ns_t_cname, conv.xfrLabel(d_content));
+boilerplate_conv(NS, ns_t_ns, conv.xfrLabel(d_content, true));
+boilerplate_conv(PTR, ns_t_ptr, conv.xfrLabel(d_content, true));
+boilerplate_conv(CNAME, ns_t_cname, conv.xfrLabel(d_content, true));
 boilerplate_conv(TXT, ns_t_txt, conv.xfrText(d_text));
 boilerplate_conv(SPF, 99, conv.xfrText(d_text));
@@ -175 +175 @@
 boilerplate_conv(MX, ns_t_mx, 
                  conv.xfr16BitInt(d_preference);
-                 conv.xfrLabel(d_mxname);
+                 conv.xfrLabel(d_mxname, true);
                  )
 
@@ -205 +205 @@
 
 boilerplate_conv(SOA, ns_t_soa, 
-                 conv.xfrLabel(d_mname);
-                 conv.xfrLabel(d_rname);
+                 conv.xfrLabel(d_mname, true);
+                 conv.xfrLabel(d_rname, true);
                  conv.xfr32BitInt(d_st.serial);
                  conv.xfr32BitInt(d_st.refresh);
@@ -222 +222 @@
                  )
 
-
-
 boilerplate_conv(RRSIG, 46, 
                  conv.xfrType(d_type); 
@@ -237 +235 @@
                  )
                  
-
-
 boilerplate_conv(DNSKEY, 48, 
                  conv.xfr16BitInt(d_flags); 
@@ -246 +242 @@
                  )
 
-
-
-                 
-
 static struct Reporter
 {
@@ -256 +248 @@
     ARecordContent::report();
     AAAARecordContent::report();
-    //   OneLabelRecordContent::report();
     NSRecordContent::report();
     CNAMERecordContent::report();

trunk/pdns/pdns/dnswriter.cc

@@ -2 +2 @@
 #include "misc.hh"
 #include "dnsparser.hh"
-
-static const string EncodeDNSLabel(const string& input)
-{
-  typedef vector<string> parts_t;
-  parts_t parts;
-  stringtok(parts,input,".");
-
-  string ret;
-  for(parts_t::const_iterator i=parts.begin(); i!=parts.end(); ++i) {
-    ret.append(1, (char)i->length());
-    ret.append(*i);
-  }
-  ret.append(1,(char)0);
-  return ret;
-}
 
 DNSPacketWriter::DNSPacketWriter(vector<uint8_t>& content, const string& qname, uint16_t  qtype, uint16_t qclass)
@@ -31 +16 @@
   d_content.insert(d_content.end(), ptr, ptr + sizeof(dnsheader));    
   
-  string label=EncodeDNSLabel(d_qname);
-  ptr=(const uint8_t*) label.c_str();
-  d_content.insert(d_content.end(), ptr, ptr + label.length());    
-  
+  xfrLabel(qname, false);
+  d_content.insert(d_content.end(), d_record.begin(), d_record.end());
+  d_record.clear();
+
   qtype=htons(qtype);
   ptr=(const uint8_t*)&qtype;
@@ -59 +44 @@
   d_recordqclass=qclass;
   d_recordttl=ttl;
+
+  d_stuff = 0; 
+
+  xfrLabel(d_recordqname, true);
+  d_content.insert(d_content.end(), d_record.begin(), d_record.end());
+  d_record.clear();
+
+  d_stuff = sizeof(dnsrecordheader); // this is needed to get compressed label offsets right, the dnsrecordheader will be interspersed
 
   dnsheader* dh=reinterpret_cast<dnsheader*>( &*d_content.begin());
@@ -119 +112 @@
 }
 
-void DNSPacketWriter::xfrLabel(const string& label)
+
+void DNSPacketWriter::xfrLabel(const string& label, bool compress)
 {
-  string encoded=EncodeDNSLabel(label);
-  const uint8_t* ptr=reinterpret_cast<const uint8_t*>(encoded.c_str());
+  typedef vector<string> parts_t;
+  parts_t parts;
+  stringtok(parts, label, ".");
+  
+  string enc;
+  unsigned int pos=d_content.size() + d_record.size() + d_stuff; // d_stuff is amount of stuff that is yet to be written out - the dnsrecordheader for example
+  string chopped(label);
+  
+  for(parts_t::const_iterator i=parts.begin(); i!=parts.end(); ++i) {
+    map<string, uint16_t>::iterator li;
+    if(compress && (li=d_labelmap.find(chopped))!=d_labelmap.end()) {   // see if we've written out this domain before
+      uint16_t offset=li->second;
+      offset|=0xc000;
+      enc.append(1, (char)(offset >> 8));
+      enc.append(1, (char)(offset & 0xff));
+      goto out;                                 // skip trailing 0 in case of compression
+    }
+    else if(compress || d_labelmap.count(chopped)) { // if 'compress' is true, li will be equal to d_labelmap.end()
+      d_labelmap[chopped]=pos;                       //  if untrue, we need to count 
+    }
+    enc.append(1, (char)i->length());
+    enc.append(*i);
+    pos+=i->length()+1;
+    chopOff(chopped);                   // www.powerdns.com -> powerdns.com -> com 
+  }
+  enc.append(1,(char)0);
 
-  d_record.insert(d_record.end(), ptr, ptr+encoded.size());
+ out:;
+
+  const uint8_t* ptr=reinterpret_cast<const uint8_t*>(enc.c_str());
+  d_record.insert(d_record.end(), ptr, ptr+enc.size());
 }
 
@@ -137 +158 @@
 void DNSPacketWriter::commit()
 {
-  string label=EncodeDNSLabel(d_recordqname); // write out qname
-
-  const uint8_t* ptr=(const uint8_t*) label.c_str();
-  d_content.insert(d_content.end(), ptr, ptr + label.length());
-
-  // write out dnsrecordheader
+  // build dnsrecordheader
   struct dnsrecordheader drh;
   drh.d_type=htons(d_recordqtype);
@@ -149 +165 @@
   drh.d_clen=htons(d_record.size());
 
-  ptr=(const uint8_t*)&drh;
+  // and write out the header
+  const uint8_t* ptr=(const uint8_t*)&drh;
   d_content.insert(d_content.end(), ptr, ptr+sizeof(drh));
 
@@ -155 +172 @@
   d_content.insert(d_content.end(), d_record.begin(), d_record.end());
 
-  d_record.clear();   // clear d_record
+  d_record.clear();   // clear d_record, ready for next record
 }
 

trunk/pdns/pdns/dnswriter.hh

@@ -4 +4 @@
 #include <string>
 #include <vector>
+#include <map>
 #include <stdint.h>
 
@@ -39 +40 @@
   enum Place {ANSWER=1, AUTHORITY=2, ADDITIONAL=3}; 
 
+  //! Start a DNS Packet in the vector passed, with question qname, qtype and qclass
   DNSPacketWriter(vector<uint8_t>& content, const string& qname, uint16_t  qtype, uint16_t qclass=1);
+  
+  /** Start a new DNS record within this packet for namq, qtype, ttl, class and in the requested place. Note that packets can only be written in natural order - 
+      ANSWER, AUTHORITY, ADDITIONAL */
   void startRecord(const string& name, uint16_t qtype, uint32_t ttl=3600, uint16_t qclass=1, Place place=ANSWER);
+
+  /** Shorthand way to add an Opt-record, for example for EDNS0 purposes */
   void addOpt(int udpsize, int extRCode, int Z);
+
+  /** needs to be called after the last record is added, but can be called again and again later on. Is called internally by startRecord too.
+      The content of the vector<> passed to the constructor is inconsistent until commit is called.
+   */
+  void commit();
 
   void xfr32BitInt(uint32_t val);
@@ -61 +73 @@
   void xfr8BitInt(uint8_t val);
 
-  void xfrLabel(const string& label);
+  void xfrLabel(const string& label, bool compress=false);
   void xfrText(const string& text);
   void xfrBlob(const string& blob);
-  void commit();
-  
+
   uint16_t d_pos;
 
@@ -77 +88 @@
   uint16_t d_recordqtype, d_recordqclass;
   uint32_t d_recordttl;
+  map<string, uint16_t> d_labelmap;
+  uint16_t d_stuff;
 };
 #endif

trunk/pdns/pdns/misc.cc

@@ -322 +322 @@
   char tmp[5];
   string ret;
-  ret.resize(str.size()*2.2);
+  ret.resize((int)(str.size()*2.2));
 
   for(string::size_type n=0;n<str.size();++n) {

trunk/pdns/pdns/rcpgenerator.cc

@@ -100 +100 @@
 
 
-void RecordTextReader::xfrLabel(string& val)
+void RecordTextReader::xfrLabel(string& val, bool)
 {
   skipSpaces();
@@ -110 +110 @@
   if(val.empty())
     val=d_zone;
-  else {
+  else if(!d_zone.empty()) {
     char last=val[val.size()-1];
    
@@ -241 +241 @@
 
 
-void RecordTextWriter::xfrLabel(const string& val)
+void RecordTextWriter::xfrLabel(const string& val, bool)
 {
   if(!d_string.empty())

trunk/pdns/pdns/rcpgenerator.hh

@@ -46 +46 @@
   void xfrTime(uint32_t& val);
 
-  void xfrLabel(string& val);
+  void xfrLabel(string& val, bool compress=false);
   void xfrText(string& val);
   void xfrBlob(string& val);
@@ -70 +70 @@
 
   void xfrType(const uint16_t& val);
-  void xfrLabel(const string& val);
+  void xfrLabel(const string& val, bool compress=false);
   void xfrText(const string& val);
   void xfrBlob(const string& val);

trunk/pdns/pdns/sdig.cc

@@ -17 +17 @@
   vector<uint8_t> packet;
 
+  
   DNSPacketWriter pw(packet, argv[3], DNSRecordContent::TypeToNumber(argv[4]));
+#if 0  
+  static char*ips[]={"198.41.0.4", "192.228.79.201", "192.33.4.12", "128.8.10.90", "192.203.230.10", "192.5.5.241", "192.112.36.4", "128.63.2.53", 
+                     "192.36.148.17","192.58.128.30", "193.0.14.129", "198.32.64.12", "202.12.27.33"};
+  static char templ[40];
+  strncpy(templ,"a.root-servers.net", sizeof(templ) - 1);
+  for(char c='a';c<='m';++c) {
+    *templ=c;
+    
+    pw.startRecord("", DNSRecordContent::TypeToNumber("NS"));
+    NSRecordContent nrc(templ);
+    nrc.toPacket(pw);
+  }
   
-  pw.setRD(true);
+  for(char c='a';c<='m';++c) {
+    *templ=c;
+    
+    pw.startRecord(templ, DNSRecordContent::TypeToNumber("A"), 3600, 1, DNSPacketWriter::ADDITIONAL);
+    ARecordContent arc(ips[c-'a']);
+    arc.toPacket(pw);
+  }
+#endif
+  pw.commit();
 
+  //  pw.setRD(true);
+
+ 
   /*
-  pw.startRecord("enum.powerdns.com", DNSRecordContent::TypeToNumber("NSEC"));
+  pw.startRecord("powerdns.com", DNSRecordContent::TypeToNumber("NS"));
+  NSRecordContent nrc("ns1.powerdns.com");
+  nrc.toPacket(pw);
 
-  NSECRecordContent nrc("jnum.powerdns.com SRV A AAAA RRSIG");
-  nrc.toPacket(pw);
+  pw.startRecord("powerdns.com", DNSRecordContent::TypeToNumber("NS"));
+  NSRecordContent nrc2("ns2.powerdns.com");
+  nrc2.toPacket(pw);
+
+  //  pw.addOpt(2800, 0, 0x8000);
   */
-
-  pw.addOpt(2800, 0, 0x8000);
 
   pw.commit();

trunk/pdns/regression-tests/double-srv/expected_result

@@ -1 +1 @@
 0       _double._tcp.dc.test.com.       IN      SRV     3600    0 100 389 server1.test.com.
+0       _double._tcp.dc.test.com.       IN      SRV     3600    1 100 389 server1.test.com.
 Rcode: 0, RD: 0, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='_double._tcp.dc.test.com.', qtype=SRV