Bitmessage/MiNode
3
0
Fork 1
Code Pull Requests 9 Actions Activity

WIP: Add support for tor using PySocks and optionally stem #2

Draft
lee.miller wants to merge 22 commits from lee.miller/MiNode:tor into v0.3
pull from: lee.miller/MiNode:tor
merge into: Bitmessage:v0.3
Conversation 0 Commits 22 Files Changed 16 +4 -1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a23bb9d12e - Show all commits

5
minode/connection.py
View File

@ -265,6 +265,7 @@ class ConnectionBase(threading.Thread):
if ( # NODE_SSL if ( # NODE_SSL
self.remote_version.services & 2 and self.network == 'ip' self.remote_version.services & 2 and self.network == 'ip'
and not self.host.endswith('.onion') and not self.host.endswith('.onion')
and not (self.server and shared.tor)
): ):
self._do_tls_handshake() self._do_tls_handshake()
@ -415,7 +416,9 @@ class ConnectionBase(threading.Thread):
shared.services, version.host, shared.listening_port)) shared.services, version.host, shared.listening_port))
if self.server: if self.server:
if self.network == 'ip': if self.network == 'ip':
self.send_queue.put(message.Version(self.host, self.port)) version_kwargs = {'services': 1} if shared.tor else {}
self.send_queue.put(message.Version(
self.host, self.port, **version_kwargs))
else: else:
self.send_queue.put(message.Version('127.0.0.1', 7656)) self.send_queue.put(message.Version('127.0.0.1', 7656))