Bitmessage/PyBitmessage-2024-12-03
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

More proxy fixes

Browse Source 
- proxy connection should be able to handle IPv6 correctly
- UI status bar notification typo fix
This commit is contained in:
Peter Šurda 2016-10-20 02:49:07 +02:00
parent ab79ee2a04
commit 4436c5f3d1
Signed by: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/class_outgoingSynSender.py
View File

@ -104,9 +104,13 @@ class outgoingSynSender(threading.Thread, StoppableThread):
if shared.shutdown: if shared.shutdown:
break break
self.name = "outgoingSynSender-" + peer.host.replace(":", ".") # log parser field separator self.name = "outgoingSynSender-" + peer.host.replace(":", ".") # log parser field separator
if peer.host.find(':') == -1:
address_family = socket.AF_INET address_family = socket.AF_INET
else: # Proxy IP is IPv6. Unlikely but possible
if shared.config.get('bitmessagesettings', 'socksproxytype') != 'none':
if ":" in shared.config.get('bitmessagesettings', 'sockshostname'):
address_family = socket.AF_INET6
# No proxy, and destination is IPv6
elif peer.host.find(':') >= 0 :
address_family = socket.AF_INET6 address_family = socket.AF_INET6
try: try:
self.sock = socks.socksocket(address_family, socket.SOCK_STREAM) self.sock = socks.socksocket(address_family, socket.SOCK_STREAM)
@ -236,7 +240,7 @@ class outgoingSynSender(threading.Thread, StoppableThread):
except socks.Socks5AuthError as err: except socks.Socks5AuthError as err:
shared.UISignalQueue.put(( shared.UISignalQueue.put((
'updateStatusBar', tr._translate( 'updateStatusBar', tr._translate(
"MainWindow", "SOCKS5 Authentication problem: %1. Please check your SOCKS5 settings").arg(str(err)))) "MainWindow", "SOCKS5 Authentication problem: %1. Please check your SOCKS5 settings.").arg(str(err))))
except socks.Socks5Error as err: except socks.Socks5Error as err:
if err[0][0] in [3, 4, 5, 6]: if err[0][0] in [3, 4, 5, 6]:
# this is a more bening "error": host unreachable, network unreachable, connection refused, TTL expired # this is a more bening "error": host unreachable, network unreachable, connection refused, TTL expired