From 9fbee668aa724691fe934c987c274f4c038fc5e0 Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Fri, 20 Dec 2019 01:21:43 -0600 Subject: [PATCH] fix regression exposing socks port to daemon instead of api server --- src/netcontroller/torcontrol/gentorrc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/netcontroller/torcontrol/gentorrc.py b/src/netcontroller/torcontrol/gentorrc.py index 916ab854..37079221 100644 --- a/src/netcontroller/torcontrol/gentorrc.py +++ b/src/netcontroller/torcontrol/gentorrc.py @@ -18,6 +18,7 @@ def generate_torrc(net_controller, api_server_ip): """ socks_port = net_controller.socksPort hs_ver = '# v2 onions' + hs_port = net_controller.hsPort home_dir = identifyhome.identify_home() tor_config_location = home_dir + '/torrc' @@ -60,7 +61,7 @@ HashedControlPassword """ + str(password) + """ HiddenServiceNumIntroductionPoints 6 HiddenServiceMaxStreams 100 HiddenServiceMaxStreamsCloseCircuit 1 -HiddenServicePort 80 """ + api_server_ip + """:""" + str(socks_port) +HiddenServicePort 80 """ + api_server_ip + """:""" + str(hs_port) torrc_data = add_bridges(torrc_data)