V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Showing only changes of commit 7b4264a109 - Show all commits

View File

@ -171,7 +171,7 @@ def assembleVersionMessage(remoteHost, remotePort, myStreamNumber, server = Fals
payload += pack('>q', 1) # bitflags of the services I offer. payload += pack('>q', 1) # bitflags of the services I offer.
payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + pack( payload += '\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF' + pack(
'>L', 2130706433) # = 127.0.0.1. This will be ignored by the remote host. The actual remote connected IP will be used. '>L', 2130706433) # = 127.0.0.1. This will be ignored by the remote host. The actual remote connected IP will be used.
if safeConfigGetBoolean('bitmessagesettings', 'upnp' and extPort): if safeConfigGetBoolean('bitmessagesettings', 'upnp') and extPort:
payload += pack('>H', extPort) payload += pack('>H', extPort)
else: else:
payload += pack('>H', shared.config.getint('bitmessagesettings', 'port')) payload += pack('>H', shared.config.getint('bitmessagesettings', 'port'))