[tor-commits] [ooni-probe/master] Properly handle errors when DNS lookups

[art@xxxxxxxxxxxxxx]

commit 1e692a0412a3abee62e72d3330a7ef93b0825405
Author: Arturo Filastò <art@xxxxxxxxx>
Date:   Fri Feb 1 21:38:39 2013 +0100

    Properly handle errors when DNS lookups
---
 nettests/blocking/dnstamper.py |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/nettests/blocking/dnstamper.py b/nettests/blocking/dnstamper.py
index 1ef2c89..1e4d260 100644
--- a/nettests/blocking/dnstamper.py
+++ b/nettests/blocking/dnstamper.py
@@ -114,7 +114,14 @@ class DNSTamperTest(dnst.DNSTest):
             log.msg("Testing resolver: %s" % test_resolver)
             test_dns_server = (test_resolver, 53)
 
-            experiment_answers = yield self.performALookup(hostname, test_dns_server)
+            try:
+                experiment_answers = yield self.performALookup(hostname, test_dns_server)
+            except Exception, e:
+                log.err("Problem performing the DNS lookup")
+                log.exception(e)
+                self.report['tampering'][test_resolver] = 'dns_lookup_error'
+                continue
+
             if not experiment_answers:
                 log.err("Got no response, perhaps the DNS resolver is down?")
                 self.report['tampering'][test_resolver] = 'no_answer'



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits