From bfbe766c8e34a258241012da5ff6c15d8142261a Mon Sep 17 00:00:00 2001 From: Batch User Date: Thu, 20 Feb 2014 11:51:56 -0800 Subject: add options rotate handling for resolv.conf "options rotate" line, enable shuffling of nameservers before each query. (should just rotate start position and maintain order?). --- dns/resolver.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dns/resolver.py b/dns/resolver.py index 934d39b..88419e9 100644 --- a/dns/resolver.py +++ b/dns/resolver.py @@ -21,6 +21,7 @@ import socket import sys import time +import random try: import threading as _threading @@ -508,6 +509,7 @@ class Resolver(object): self.cache = None self.flags = None self.retry_servfail = False + self.rotate = False def read_resolv_conf(self, f): """Process f as a file in the /etc/resolv.conf format. If f is @@ -538,6 +540,9 @@ class Resolver(object): elif tokens[0] == 'search': for suffix in tokens[1:]: self.search.append(dns.name.from_text(suffix)) + elif tokens[0] == 'options': + if len(tokens) == 2 and tokens[1] == 'rotate': + self.rotate = True finally: if want_close: f.close() @@ -811,6 +816,8 @@ class Resolver(object): # make a copy of the servers list so we can alter it later. # nameservers = self.nameservers[:] + if self.rotate: + random.shuffle(nameservers) backoff = 0.10 while response is None: if len(nameservers) == 0: -- cgit v1.2.1