summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortraumschule <traumschuleriebau@riseup.net>2019-01-03 21:37:22 -0500
committertraumschule <traumschuleriebau@riseup.net>2019-01-03 21:50:04 -0500
commit77727967709fa27551970aa512af33c9eece1e3a (patch)
tree48576b60881613fb64d5bc68907e87fb7bd22dec
parent215003d8dc978f79e7a1d2268d38d1aa54841c6f (diff)
downloadcloudflare-tor-77727967709fa27551970aa512af33c9eece1e3a.tar
cloudflare-tor-77727967709fa27551970aa512af33c9eece1e3a.tar.gz
cloudflare-tor-77727967709fa27551970aa512af33c9eece1e3a.tar.lz
cloudflare-tor-77727967709fa27551970aa512af33c9eece1e3a.tar.xz
cloudflare-tor-77727967709fa27551970aa512af33c9eece1e3a.zip
Catch when SocksPort is empty.
-rwxr-xr-xglobalist/globalist/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/globalist/globalist/__init__.py b/globalist/globalist/__init__.py
index 12bad40a..73c6fe38 100755
--- a/globalist/globalist/__init__.py
+++ b/globalist/globalist/__init__.py
@@ -371,7 +371,10 @@ def main(args=[]):
# TODO implement authentication token / cookie
controller = Controller.from_port(port = options.a_controlport)
controller.authenticate()
- STATUS['socksport'] = controller.get_conf('SocksPort').split(" ",1)[0]
+ if controller.get_conf('SocksPort'):
+ STATUS['socksport'] = controller.get_conf('SocksPort').split(" ",1)[0]
+ else:
+ STATUS['socksport'] = 9050
controller.close()
config = cp.ConfigParser()