Fix resolver EDNS0 payload size when EDNS0 enabled by resolv.conf.

[Issue #546]

diff --git a/dns/resolver.py b/dns/resolver.py
index bad24dc7d422981cc9e3a2305a56dcd57197d62e..f9d54ea395ec661d61eff1d0636287a9db25912d 100644 (file)
--- a/dns/resolver.py
+++ b/dns/resolver.py
@@ -832,7 +832,7 @@ class Resolver:
                         if opt == 'rotate':
                             self.rotate = True
                         elif opt == 'edns0':
-                            self.use_edns(0, 0, 0)
+                            self.use_edns()
                         elif 'timeout' in opt:
                             try:
                                 self.timeout = int(opt.split(':')[1])
@@ -1208,7 +1208,7 @@ class Resolver:
         self.keyname = keyname
         self.keyalgorithm = algorithm
 
-    def use_edns(self, edns, ednsflags, payload):
+    def use_edns(self, edns=0, ednsflags=0, payload=1280):
         """Configure EDNS behavior.
 
         *edns*, an ``int``, is the EDNS level to use.  Specifying

diff --git a/tests/test_resolver.py b/tests/test_resolver.py
index 31e49f8bb6bbddd5ec01550c38dcbfb3bc29e3cf..85abeb260b9658b035c8a3b80a40ec65833b2780 100644 (file)
--- a/tests/test_resolver.py
+++ b/tests/test_resolver.py
@@ -166,6 +166,7 @@ class BaseResolverTests(unittest.TestCase):
         self.assertEqual(r.timeout, 1)
         self.assertEqual(r.ndots, 2)
         self.assertEqual(r.edns, 0)
+        self.assertEqual(r.payload, 1280)
 
     def testReadOptionsBadTimeouts(self):
         f = StringIO(bad_timeout_1)