Changeset 974

Timestamp:

03/18/07 13:44:12 (6 years ago)

Author:

ahu

Message:

close ticket #130 - unable to send servfail, thanks to ch

Files:

• trunk/pdns/pdns/dnspacket.cc (modified) (2 diffs)

trunk/pdns/pdns/dnspacket.cc

@@ -310 +310 @@
   DNSPacketWriter pw(packet, qdomain, qtype.getCode(), 1);
 
+  pw.getHeader()->rcode=d.rcode;
   pw.getHeader()->aa=d.aa;
   pw.getHeader()->ra=d.ra;
@@ -316 +317 @@
   pw.getHeader()->rd=d.rd;
 
-  for(pos=rrs.begin();pos<rrs.end();++pos) {
-    // this needs to deal with the 'prio' mismatch!
-    if(pos->qtype.getCode()==QType::MX || pos->qtype.getCode() == QType::SRV) {  
-      pos->content = lexical_cast<string>(pos->priority) + " " + pos->content;
-    }
-    pw.startRecord(pos->qname, pos->qtype.getCode(), pos->ttl, 1, (DNSPacketWriter::Place)pos->d_place); 
-    shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(pos->qtype.getCode(), 1, pos->content)); 
-    drc->toPacket(pw);
-  }
-  try {
-    pw.commit();
-  }
-  catch(exception& e) {
-    cerr<<"Exception: "<<e.what()<<endl;
-    throw;
+  if(!rrs.empty()) {
+    for(pos=rrs.begin();pos<rrs.end();++pos) {
+      // this needs to deal with the 'prio' mismatch!
+      if(pos->qtype.getCode()==QType::MX || pos->qtype.getCode() == QType::SRV) {  
+        pos->content = lexical_cast<string>(pos->priority) + " " + pos->content;
+      }
+      pw.startRecord(pos->qname, pos->qtype.getCode(), pos->ttl, 1, (DNSPacketWriter::Place)pos->d_place); 
+      shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(pos->qtype.getCode(), 1, pos->content)); 
+      drc->toPacket(pw);
+    }
+    try {
+      pw.commit();
+    }
+    catch(exception& e) {
+      cerr<<"Exception: "<<e.what()<<endl;
+      throw;
+    }
   }
   stringbuffer.assign((char*)&packet[0], packet.size());