[tor-commits] [ooni-probe/master] Parametrize tor socksport for usage with modified HTTP Agent

[art at torproject.org]

commit d482b29e85a157419fce4d728d74a7b4b6c017be
Author: Arturo Filastò <art at fuffa.org>
Date:   Fri Nov 16 10:13:16 2012 +0100

    Parametrize tor socksport for usage with modified HTTP Agent
---
 ooni/templates/httpt.py |    6 +++++-
 ooniprobe.conf          |    1 +
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ooni/templates/httpt.py b/ooni/templates/httpt.py
index b5849d3..3a4201c 100644
--- a/ooni/templates/httpt.py
+++ b/ooni/templates/httpt.py
@@ -16,8 +16,10 @@ from twisted.internet.error import ConnectionRefusedError
 
 from twisted.web._newclient import Request
 from twisted.web.http_headers import Headers
+
 from ooni.nettest import NetTestCase
 from ooni.utils import log
+from ooni import config
 
 from ooni.utils.net import BodyReceiver, StringProducer, userAgents
 
@@ -51,7 +53,9 @@ class HTTPTest(NetTestCase):
             log.err("Warning! pyOpenSSL is not installed. https websites will"
                      "not work")
 
-        self.agent = Agent(reactor, sockhost="127.0.0.1", sockport=9050)
+        self.agent = Agent(reactor, 
+                sockhost="127.0.0.1", 
+                sockport=config.advanced.tor_socksport)
 
         if self.followRedirects:
             try:
diff --git a/ooniprobe.conf b/ooniprobe.conf
index 191d809..2e5992a 100644
--- a/ooniprobe.conf
+++ b/ooniprobe.conf
@@ -24,4 +24,5 @@ advanced:
     geoip_data_dir: /home/x/code/networking/ooni-probe/data/
     debug: true
     threadpool_size: 10
+    tor_socksport: 9050