Peter Surda
a0bbd21efc
- outbound peers now have a rating - it's also shown in the network status tab - currently it's between -1 to +1, changes by 0.1 steps and uses a hyperbolic function 0.05/(1.0 - rating) to convert rating to probability with which we should connect to that node when randomly chosen - it increases when we successfully establish a full outbound connection to a node, and decreases when we fail to do that - onion nodes have priority when using SOCKS
39 lines
1.3 KiB
Python
39 lines
1.3 KiB
Python
from queues import Queue
|
|
import random
|
|
|
|
from bmconfigparser import BMConfigParser
|
|
import knownnodes
|
|
from queues import portCheckerQueue, peerDiscoveryQueue
|
|
import state
|
|
|
|
def chooseConnection(stream):
|
|
haveOnion = BMConfigParser().safeGet("bitmessagesettings", "socksproxytype")[0:5] == 'SOCKS'
|
|
if state.trustedPeer:
|
|
return state.trustedPeer
|
|
try:
|
|
retval = portCheckerQueue.get(False)
|
|
portCheckerQueue.task_done()
|
|
except Queue.Empty:
|
|
try:
|
|
retval = peerDiscoveryQueue.get(False)
|
|
peerDiscoveryQueue.task_done()
|
|
except Queue.Empty:
|
|
for i in range(50):
|
|
peer = random.choice(knownnodes.knownNodes[stream].keys())
|
|
try:
|
|
rating = knownnodes.knownNodes[stream][peer]["rating"]
|
|
except TypeError:
|
|
print "Error in %s" % (peer)
|
|
rating = 0
|
|
if haveOnion and peer.host.endswith('.onion') and rating > 0:
|
|
rating *= 10
|
|
if rating > 1:
|
|
rating = 1
|
|
try:
|
|
if 0.05/(1.0-rating) > random.random():
|
|
return peer
|
|
except ZeroDivisionError:
|
|
return peer
|
|
raise ValueError
|
|
return retval
|