Changeset 2214

Timestamp:

06/09/11 23:18:10 (2 years ago)

Author:

ahu

Message:

Christoph Meerwald discovered we do not parse EDNS options on TSIG-signed questions, since we expect the OPT record to be the last one.

Files:

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

trunk/pdns/pdns/dnsrecords.cc

@@ -19 +19 @@
 #include "utility.hh"
 #include "dnsrecords.hh"
+#include <boost/foreach.hpp>
 
 boilerplate_conv(A, ns_t_a, conv.xfrIP(d_ip));
@@ -299 +300 @@
                  )
 
+
+
 bool getEDNSOpts(const MOADNSParser& mdp, EDNSOpts* eo)
 {
-  if(mdp.d_header.arcount && !mdp.d_answers.empty() && 
-     mdp.d_answers.back().first.d_type == QType::OPT) {
-    eo->d_packetsize=mdp.d_answers.back().first.d_class;
-    
-    EDNS0Record stuff;
-    uint32_t ttl=ntohl(mdp.d_answers.back().first.d_ttl);
-    memcpy(&stuff, &ttl, sizeof(stuff));
-
-    eo->d_extRCode=stuff.extRCode;
-    eo->d_version=stuff.version;
-    eo->d_Z = ntohs(stuff.Z);
-    OPTRecordContent* orc = 
-      dynamic_cast<OPTRecordContent*>(mdp.d_answers.back().first.d_content.get());
-    if(!orc)
-      return false;
-    orc->getData(eo->d_options);
-
-    return true;
-  }
-  else
-    return false;
+  if(mdp.d_header.arcount && !mdp.d_answers.empty()) {
+    BOOST_FOREACH(const MOADNSParser::answers_t::value_type& val, mdp.d_answers) {
+      if(val.first.d_place == DNSRecord::Additional && val.first.d_type == QType::OPT) {
+        eo->d_packetsize=val.first.d_class;
+       
+        EDNS0Record stuff;
+        uint32_t ttl=ntohl(val.first.d_ttl);
+        memcpy(&stuff, &ttl, sizeof(stuff));
+        
+        eo->d_extRCode=stuff.extRCode;
+        eo->d_version=stuff.version;
+        eo->d_Z = ntohs(stuff.Z);
+        OPTRecordContent* orc = 
+          dynamic_cast<OPTRecordContent*>(val.first.d_content.get());
+        if(!orc)
+          return false;
+        orc->getData(eo->d_options);
+        return true;
+      }
+    }
+  }
+  return false;
 }