Changeset 514 for trunk/pdns/pdns/dnswriter.cc

Timestamp:

10/10/05 21:42:06 (8 years ago)

Author:

ahu

Message:

the gist is: move pdns_recursor over to new {zone,packet}-{parser,generator} stuff
this means the pdns_recursor does not use DNSPacket anymore (yay)
Commit adds:

d_qtype storage to all DNSRecordContent classes
infrastructure to extract *only* the record for a packet, assuming it came with a qname
add reportAllTypes() if you want to be able to parse all types,

reportBasicTypes() for the pdns_recursor
reportOtherTypes() if you want the rest too

updates Makefile.am so everything compiles again
fix endian issues in packetwriter/parser

remove virtualness/inheritance from the pdns_recursor storage cache (teeny speedup)

Things might be a bit scary in the recursor now.

Files:

• trunk/pdns/pdns/dnswriter.cc (modified) (6 diffs)

trunk/pdns/pdns/dnswriter.cc

@@ -27 +27 @@
   ptr=(const uint8_t*)&qclass;
   d_content.insert(d_content.end(), ptr, ptr+2);
+
+  d_stuff=0xffff;
 }
 
@@ -34 +36 @@
 }
 
-void DNSPacketWriter::setRD(bool rd)
-{
-  dnsheader* dh=reinterpret_cast<dnsheader*>( &*d_content.begin());
-  dh->rd=rd;
-}
 
 void DNSPacketWriter::startRecord(const string& name, uint16_t qtype, uint32_t ttl, uint16_t qclass, Place place)
@@ -57 +54 @@
 
   d_stuff = sizeof(dnsrecordheader); // this is needed to get compressed label offsets right, the dnsrecordheader will be interspersed
+  d_sor=d_content.size() + d_stuff; // start of real record 
 
   dnsheader* dh=reinterpret_cast<dnsheader*>( &*d_content.begin());
@@ -95 +93 @@
 void DNSPacketWriter::xfr32BitInt(uint32_t val)
 {
-  uint8_t* ptr=reinterpret_cast<uint8_t*>(&val);
+  int rval=htonl(val);
+  uint8_t* ptr=reinterpret_cast<uint8_t*>(&rval);
   d_record.insert(d_record.end(), ptr, ptr+4);
 }
@@ -101 +100 @@
 void DNSPacketWriter::xfr16BitInt(uint16_t val)
 {
-  uint8_t* ptr=reinterpret_cast<uint8_t*>(&val);
+  int rval=htons(val);
+  uint8_t* ptr=reinterpret_cast<uint8_t*>(&rval);
   d_record.insert(d_record.end(), ptr, ptr+2);
 }
@@ -160 +160 @@
 }
 
+void DNSPacketWriter::getRecords(string& records)
+{
+  records.assign(d_content.begin() + d_sor, d_content.end());
+}
 
 void DNSPacketWriter::commit()
 {
+  if(d_stuff==0xffff && (d_content.size()!=d_sor || !d_record.empty()))
+    throw MOADNSException("DNSPacketWriter::commit() called without startRecord ever having been called, but a record was added");
   // build dnsrecordheader
   struct dnsrecordheader drh;