Accept addresses which lack the prepended BM-; useful for copying and pasting #18

Merged
Atheros1 merged 4 commits from master into master 2012-12-19 20:53:59 +01:00
Showing only changes of commit 27aa86e741 - Show all commits

View File

@ -80,7 +80,7 @@ class outgoingSynSender(QThread):
self.alreadyAttemptedConnectionsList.append(HOST) self.alreadyAttemptedConnectionsList.append(HOST)
PORT, timeNodeLastSeen = knownNodes[self.streamNumber][HOST] PORT, timeNodeLastSeen = knownNodes[self.streamNumber][HOST]
sock = socks.socksocket(socket.AF_INET, socket.SOCK_STREAM) sock = socks.socksocket(socket.AF_INET, socket.SOCK_STREAM)
sock.settimeout(6) sock.settimeout(20)
if config.get('bitmessagesettings', 'socksproxytype') == 'none': if config.get('bitmessagesettings', 'socksproxytype') == 'none':
printLock.acquire() printLock.acquire()
print 'Trying an outgoing connection to', HOST, ':', PORT print 'Trying an outgoing connection to', HOST, ':', PORT