citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix setting socksproxytype and return in proxyconfig_stem:

Browse Source 
socksproxytype is set to SOCKS5 temporary if proxyconfig succeeds.
This commit is contained in:
Dmitri Bogomolov 2019-09-22 15:35:10 +03:00
parent 168c4a5696
commit c35f48bd0b
Signed by untrusted user: g1itch
GPG Key ID: 720A756F18DEED13
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/proxyconfig_stem.py
View File

@ -43,6 +43,7 @@ def connect_plugin(config): # pylint: disable=too-many-branches
): ):
# remote proxy is choosen for outbound connections, # remote proxy is choosen for outbound connections,
# nothing to do here, but need to set socksproxytype to SOCKS5! # nothing to do here, but need to set socksproxytype to SOCKS5!
config.set('bitmessagesettings', 'socksproxytype', 'SOCKS5')
logwrite( logwrite(
'sockshostname is set to remote address,' 'sockshostname is set to remote address,'
' aborting stem proxy configuration') ' aborting stem proxy configuration')
@ -77,6 +78,8 @@ def connect_plugin(config): # pylint: disable=too-many-branches
logwrite('Started tor on port %s' % port) logwrite('Started tor on port %s' % port)
break break
config.setTemp('bitmessagesettings', 'socksproxytype', 'SOCKS5')
if config.safeGetBoolean('bitmessagesettings', 'sockslisten'): if config.safeGetBoolean('bitmessagesettings', 'sockslisten'):
# need a hidden service for inbound connections # need a hidden service for inbound connections
try: try:
@ -117,6 +120,5 @@ def connect_plugin(config): # pylint: disable=too-many-branches
config.set( config.set(
onionhostname, 'keytype', response.private_key_type) onionhostname, 'keytype', response.private_key_type)
config.save() config.save()
config.set('bitmessagesettings', 'socksproxytype', 'SOCKS5')
return True return True