BIND 10 master, updated. ec4ebeb8ecfae6b0e3cc6fedabb7e2f84509c930 [master] update changelog

[BIND 10 source code commits]

The branch, master has been updated
       via  ec4ebeb8ecfae6b0e3cc6fedabb7e2f84509c930 (commit)
       via  48e10c2530fe52c9bde6197db07674a851aa0f5d (commit)
       via  41139644452bb11a162254b442ab611644ceb603 (commit)
       via  c84b3ecae4d2d0b532c64c958857f8104dbae923 (commit)
       via  27ba6b2117e3ab88aedaa904292707871e131393 (commit)
       via  efea92bd3f50b23ed5d551cd7f140abe47959bfd (commit)
      from  c4a9bf2722c9650c1c0f4290670ff33c0b7af87c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ec4ebeb8ecfae6b0e3cc6fedabb7e2f84509c930
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Jun 3 11:05:05 2011 +0200

    [master] update changelog

commit 48e10c2530fe52c9bde6197db07674a851aa0f5d
Merge: c4a9bf2722c9650c1c0f4290670ff33c0b7af87c 41139644452bb11a162254b442ab611644ceb603
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Jun 3 10:56:03 2011 +0200

    Merge branch 'trac834'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                  |    4 ++++
 src/lib/asiodns/io_fetch.cc                |   13 +++----------
 src/lib/asiodns/tests/io_fetch_unittest.cc |    3 +++
 3 files changed, 10 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index e8b05ab..e916e1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+247.    [func]      jelte
+	Upstream queries from the resolver now set EDNS0 buffer size.
+	(Trac834, git 48e10c2530fe52c9bde6197db07674a851aa0f5d)
+
 246.    [func]      stephen
 	Implement logging using log4cplus (http://log4cplus.sourceforge.net)
 	(Trac899, git 31d3f525dc01638aecae460cb4bc2040c9e4df10)
diff --git a/src/lib/asiodns/io_fetch.cc b/src/lib/asiodns/io_fetch.cc
index e535381..4b2edf9 100644
--- a/src/lib/asiodns/io_fetch.cc
+++ b/src/lib/asiodns/io_fetch.cc
@@ -209,16 +209,6 @@ IOFetch::IOFetch(Protocol protocol, IOService& service,
     msg->setHeaderFlag(Message::HEADERFLAG_CD,
                        query_message->getHeaderFlag(Message::HEADERFLAG_CD));
 
-    ConstEDNSPtr edns(query_message->getEDNS());
-    const bool dnssec_ok = edns && edns->getDNSSECAwareness();
-    if (edns) {
-        EDNSPtr edns_response(new EDNS());
-        edns_response->setDNSSECAwareness(dnssec_ok);
-        // TODO: We should make our own edns bufsize length configurable
-        edns_response->setUDPSize(Message::DEFAULT_MAX_EDNS0_UDPSIZE);
-        msg->setEDNS(edns_response);
-    }
-
     initIOFetch(msg, protocol, service,
                 **(query_message->beginQuestion()),
                 address, port, buff, cb, wait);
@@ -238,6 +228,9 @@ IOFetch::initIOFetch(MessagePtr& query_msg, Protocol protocol, IOService& servic
     query_msg->setRcode(Rcode::NOERROR());
     query_msg->setHeaderFlag(Message::HEADERFLAG_RD);
     query_msg->addQuestion(question);
+    EDNSPtr edns_query(new EDNS());
+    edns_query->setUDPSize(Message::DEFAULT_MAX_EDNS0_UDPSIZE);
+    query_msg->setEDNS(edns_query);
     MessageRenderer renderer(*data_->msgbuf);
     query_msg->toWire(renderer);
 }
diff --git a/src/lib/asiodns/tests/io_fetch_unittest.cc b/src/lib/asiodns/tests/io_fetch_unittest.cc
index 2464b6d..52a51a1 100644
--- a/src/lib/asiodns/tests/io_fetch_unittest.cc
+++ b/src/lib/asiodns/tests/io_fetch_unittest.cc
@@ -130,6 +130,9 @@ public:
         msg.setRcode(Rcode::NOERROR());
         msg.setHeaderFlag(Message::HEADERFLAG_RD);
         msg.addQuestion(question_);
+        EDNSPtr msg_edns(new EDNS());
+        msg_edns->setUDPSize(Message::DEFAULT_MAX_EDNS0_UDPSIZE);
+        msg.setEDNS(msg_edns);
         MessageRenderer renderer(*msgbuf_);
         msg.toWire(renderer);
         MessageRenderer renderer2(*expected_buffer_);