[tor-commits] [ooni-probe/master] Include the resolver IP:Port in the report

art at torproject.org art at torproject.org
Tue Nov 20 19:40:51 UTC 2012


commit c48fc7c32d33ac00026f6d2f9da8080a38a89b88
Author: Arturo Filastò <art at fuffa.org>
Date:   Tue Nov 20 20:38:37 2012 +0100

    Include the resolver IP:Port in the report
---
 ooni/templates/dnst.py |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ooni/templates/dnst.py b/ooni/templates/dnst.py
index 7a6eb37..01678cb 100644
--- a/ooni/templates/dnst.py
+++ b/ooni/templates/dnst.py
@@ -41,6 +41,7 @@ class DNSTest(NetTestCase):
                     name = answer.payload.name
 
             result = {}
+            result['resolver'] = dns_server
             result['query_type'] = 'PTR'
             result['query'] = repr(query)
             result['answers'] = answers
@@ -51,6 +52,7 @@ class DNSTest(NetTestCase):
         def gotError(failure):
             log.exception(failure)
             result = {}
+            result['resolver'] = dns_server
             result['query_type'] = 'PTR'
             result['query'] = repr(query)
             result['error'] = str(failure)
@@ -85,6 +87,7 @@ class DNSTest(NetTestCase):
                 r = (repr(answer), repr(answer.payload))
                 answers.append(r)
             result = {}
+            result['resolver'] = dns_server
             result['query_type'] = 'A'
             result['query'] = repr(query)
             result['answers'] = answers
@@ -95,6 +98,7 @@ class DNSTest(NetTestCase):
         def gotError(failure):
             log.exception(failure)
             result = {}
+            result['resolver'] = dns_server
             result['query_type'] = 'A'
             result['query'] = repr(query)
             result['error'] = str(failure)





More information about the tor-commits mailing list