Changeset 517 for trunk/pdns/pdns/pdns_recursor.cc

Timestamp:

10/16/05 13:47:22 (8 years ago)

Author:

ahu

Message:

add support for properly truncating records in the pdns_recursor again (was removed during upgrade to MOADNS stuff)

we can now rollback records

add support for honouring EDNS0 queries to pdns_recursor - turns out clients don't use it

EDNS0 parsing code added to MOADNSParser

properly copy recursion desired flag in

Files:

• trunk/pdns/pdns/pdns_recursor.cc (modified) (4 diffs)

trunk/pdns/pdns/pdns_recursor.cc

@@ -252 +252 @@
     DNSComboWriter* dc=(DNSComboWriter *)p;
 
+    uint16_t maxudpsize=512;
+    MOADNSParser::EDNSOpts edo;
+    if(dc->d_mdp.getEDNSOpts(&edo)) {
+      maxudpsize=edo.d_packetsize;
+    }
+
     vector<DNSResourceRecord> ret;
     
@@ -261 +267 @@
     pw.getHeader()->qr=1;
     pw.getHeader()->id=dc->d_mdp.d_header.id;
+    pw.getHeader()->rd=dc->d_mdp.d_header.rd;
 
     //    MT->setTitle("udp question for "+P.qdomain+"|"+P.qtype.getName());
@@ -278 +285 @@
       if(ret.size()) {
         for(vector<DNSResourceRecord>::const_iterator i=ret.begin();i!=ret.end();++i) {
-          pw.startRecord(i->qname, i->qtype.getCode(), i->ttl);
+          pw.startRecord(i->qname, i->qtype.getCode(), i->ttl, 1, (DNSPacketWriter::Place)i->d_place);
           shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(i->qtype.getCode(), 1, i->content));  
           drc->toPacket(pw);
+          if(!dc->d_tcp && pw.size() > maxudpsize) {
+            pw.rollback();
+            pw.getHeader()->tc=1;
+            goto sendit; // need to jump over pw.commit
+          }
         }
         pw.commit();
       }
     }
-
+  sendit:;
     if(!dc->d_tcp) {
-      /*
-      if(R->len > 512) {
-        R->truncate(512);
-      }
-      */
-
       sendto(dc->d_socket, &*packet.begin(), packet.size(), 0, (struct sockaddr *)(dc->d_remote), dc->d_socklen);
     }
@@ -772 +778 @@
             continue;
 
-          DNSComboWriter*dc = new DNSComboWriter(data, d_len);
+          DNSComboWriter* dc = new DNSComboWriter(data, d_len);
 
           dc->setRemote((struct sockaddr *)&fromaddr, addrlen);