Changeset 1299

Timestamp:

11/18/08 13:58:43 (16 months ago)

Author:

ahu

Message:

fix up the URL fancy record type, plus tell sdig no longer to emit EDNS0 by default

Location:

trunk/pdns/pdns

Files:

• packethandler.cc (modified) (4 diffs)
• sdig.cc (modified) (4 diffs)

trunk/pdns/pdns/packethandler.cc

@@ -181 +181 @@
 {
   DNSResourceRecord rr;
-
   if(p->qtype.getCode()==QType::MX)  // check if this domain has smtp service from us
     return findMboxFW(p,r,target);
@@ -187 +186 @@
   if(p->qtype.getCode()==QType::A)   // search for a URL record for an A
     return findUrl(p,r,target);
-
   return 0;
 }
@@ -661 +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;  
+        }
+      }
       DLOG(L<<"There is some data, but not of the correct type, adding SOA for NXRECORDSET"<<endl);
       SOAData sd;
@@ -679 +687 @@
       goto sendit; // this might be the end of it (client requested a CNAME, or we found the answer already)
 
-    if(d_doFancyRecords) { // MBOXFW, URL <- fake records, emulated with MX and A
-      int res=doFancyRecords(p,r,target);
-      if(res) { // had a result
-        if(res<0) // it was an error
-          r->setRcode(RCode::ServFail);
-        goto sendit;  
-      }
-    }
     
     // now ready to start the real direct search

trunk/pdns/pdns/sdig.cc

@@ -32 +32 @@
   nrc2.toPacket(pw);
   */
-
+  /*
   DNSPacketWriter::optvect_t opts;
   string ping("hallo!");
@@ -38 +38 @@
   pw.addOpt(5200, 0, 0x8000, opts);
   pw.commit();
-
+  */
   Socket sock(InterNetwork, Datagram);
   IPEndpoint dest(argv[1] + (*argv[1]=='@'), atoi(argv[2]));
-
   sock.sendTo(string((char*)&*packet.begin(), (char*)&*packet.end()), dest);
   
@@ -56 +55 @@
     cout<<"\t"<<i->first.d_ttl<<"\t"<< i->first.d_content->getZoneRepresentation()<<"\n";
   }
-
+#if 0
   EDNSOpts edo;
   if(getEDNSOpts(mdp, &edo)) {
@@ -72 +71 @@
 
   }
+#endif
 }
 catch(std::exception &e)