Changeset 1359

Timestamp:

05/16/09 17:33:21 (16 months ago)

Author:

ahu

Message:

preliminary infrastructure for signing messages with TSIG in a clean way

Location:

trunk/pdns/pdns

Files:

• dnsparser.cc (modified) (2 diffs)
• dnsparser.hh (modified) (4 diffs)
• dnswriter.hh (modified) (1 diff)

trunk/pdns/pdns/dnsparser.cc

@@ -221 +221 @@
         dr.d_place=DNSRecord::Additional;
       
+      unsigned int recordStartPos=pr.d_pos;
+
       string label=pr.getLabel();
       
@@ -233 +235 @@
       dr.d_content=boost::shared_ptr<DNSRecordContent>(DNSRecordContent::mastermake(dr, pr));
       d_answers.push_back(make_pair(dr, pr.d_pos));
+
+      if(dr.d_type == QType::TSIG && dr.d_class == 0xff) 
+        d_tsigPos = recordStartPos + sizeof(struct dnsheader);
     }
 

trunk/pdns/pdns/dnsparser.hh

@@ -201 +201 @@
   }
 
-  static const string NumberToType(uint16_t num)
-  {
-    if(!getNamemap().count(make_pair(1,num)))
+  static const string NumberToType(uint16_t num, uint16_t classnum=1)
+  {
+    if(!getNamemap().count(make_pair(classnum,num)))
       return "#" + lexical_cast<string>(num);
       //      throw runtime_error("Unknown DNS type with numerical id "+lexical_cast<string>(num));
-    return getNamemap()[make_pair(1,num)];
+    return getNamemap()[make_pair(classnum,num)];
   }
 
@@ -267 +267 @@
 
 //! This class can be used to parse incoming packets, and is copyable
-class MOADNSParser
+class MOADNSParser : public boost::noncopyable
 {
 public:
   //! Parse from a string
-  MOADNSParser(const string& buffer) 
+  MOADNSParser(const string& buffer)  : d_tsigPos(0)
   {
     init(buffer.c_str(), (unsigned int)buffer.size());
@@ -277 +277 @@
 
   //! Parse from a pointer and length
-  MOADNSParser(const char *packet, unsigned int len)
+  MOADNSParser(const char *packet, unsigned int len) : d_tsigPos(0)
   {
     init(packet, len);
@@ -299 +299 @@
   }
 
-  
+  uint16_t getTSIGPos()
+  {
+    return d_tsigPos;
+  }
 private:
   void getDnsrecordheader(struct dnsrecordheader &ah);
   void init(const char *packet, unsigned int len);
   vector<uint8_t> d_content;
+  uint16_t d_tsigPos;
 };
 

trunk/pdns/pdns/dnswriter.hh

@@ -94 +94 @@
   dnsheader* getHeader();
   void getRecords(string& records);
+  const vector<uint8_t>& getRecordBeingWritten() { return d_record; }
 
 private:
-  vector<uint8_t>& d_content;
+  vector <uint8_t>& d_content;
   vector <uint8_t> d_record;
   string d_qname;