GlcoinCore/joinmarket
1
0
Fork 0
mirror of https://github.com/JoinMarket-Org/joinmarket-clientserver.git synced 2026-08-13 12:33:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pass ClientContextFactory to TorSocksEndpoint

Browse source
This commit is contained in:
James Hilliard 2018-11-14 14:00:21 -07:00
parent 637911ddfb
commit 2313a8af25
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
jmdaemon/jmdaemon/irc.py
View file

@ -128,9 +128,10 @@ class IRCMessageChannel(MessageChannel):
wlog('building irc')
if self.tx_irc_client:
raise Exception('irc already built')
if self.usessl.lower() == 'true':
ctx = ClientContextFactory()
if self.usessl.lower() == 'true' and not self.socks5.lower() == 'true':
factory = TxIRCFactory(self)
ctx = ClientContextFactory()
reactor.connectSSL(self.serverport[0], self.serverport[1],
factory, ctx)
elif self.socks5.lower() == 'true':
@ -139,7 +140,7 @@ class IRCMessageChannel(MessageChannel):
torEndpoint = TCP4ClientEndpoint(reactor, str(self.socks5_host),
self.socks5_port)
if self.usessl.lower() == 'true':
use_tls = True
use_tls = ctx
else:
use_tls = False
ircEndpoint = TorSocksEndpoint(torEndpoint, self.serverport[0],