Changeset 1302

Timestamp:

11/18/08 18:20:16 (16 months ago)

Author:

ahu

Message:

fix up MBOXFW fancy records, plus add them to the regression tests

Location:

trunk/pdns

Files:

• pdns/dnsrecords.cc (modified) (2 diffs)
• pdns/dnsrecords.hh (modified) (1 diff)
• pdns/packethandler.cc (modified) (1 diff)
• regression-tests/mboxfw-record (added)
• regression-tests/mboxfw-record/command (added)
• regression-tests/mboxfw-record/description (added)
• regression-tests/mboxfw-record/expected_result (added)
• regression-tests/test.com (modified) (1 diff)

trunk/pdns/pdns/dnsrecords.cc

@@ -343 +343 @@
                  )
 
-boilerplate_conv(URL, 256, 
+// "fancy records" 
+boilerplate_conv(URL, QType::URL, 
                  conv.xfrLabel(d_url);
+                 )
+
+boilerplate_conv(MBOXFW, QType::MBOXFW, 
+                 conv.xfrLabel(d_mboxfw);
                  )
 
@@ -410 +415 @@
 {
   URLRecordContent::report();
+  MBOXFWRecordContent::report();
 }
 

trunk/pdns/pdns/dnsrecords.hh

@@ -373 +373 @@
 };
 
+class MBOXFWRecordContent : public DNSRecordContent // Fake, 'fancy record' with type 256
+{
+public:
+  includeboilerplate(MBOXFW)
+private:
+  string d_mboxfw;
+};
+
+
 #define boilerplate(RNAME, RTYPE)                                                                         \
 RNAME##RecordContent::DNSRecordContent* RNAME##RecordContent::make(const DNSRecord& dr, PacketReader& pr) \

trunk/pdns/pdns/packethandler.cc

@@ -659 +659 @@
     if(mret==2) { // there is some data, but not of the correct type
       r->clearRecords();
-
-      if(d_doFancyRecords) { // MBOXFW, URL <- fake records, emulated with MX and A
-        DLOG(L<<"There is some data, but not of the correct type, checking fancy records"<<endl);
-        int res=doFancyRecords(p,r,target);
-        if(res) { // had a result
-          if(res<0) // it was an error
-            r->setRcode(RCode::ServFail);
-          goto sendit;  
-        }
-      }
+    }
+    if(d_doFancyRecords) { // MBOXFW, URL <- fake records, emulated with MX and A
+      DLOG(L<<"There is some data, but not of the correct type, checking fancy records"<<endl);
+      int res=doFancyRecords(p,r,target);
+      if(res) { // had a result
+        if(res<0) // it was an error
+          r->setRcode(RCode::ServFail);
+        goto sendit;  
+      }
+    }
+    if(mret == 2) {
       DLOG(L<<"There is some data, but not of the correct type, adding SOA for NXRECORDSET"<<endl);
       SOAData sd;

trunk/pdns/regression-tests/test.com

@@ -25 +25 @@
 blah                    IN      A       9.9.9.9
 images                  IN      URL     "http://www.ds9a.nl"
+bert@test.com.                  IN      MBOXFW  "bert@ds9a.nl"