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
97 lines
4.8 KiB
Python
97 lines
4.8 KiB
Python
import socket
|
|
import defaultKnownNodes
|
|
import pickle
|
|
import time
|
|
|
|
from bmconfigparser import BMConfigParser
|
|
from debug import logger
|
|
import knownnodes
|
|
import socks
|
|
import state
|
|
|
|
def addKnownNode(stream, peer, lastseen=None, self=False):
|
|
if lastseen is None:
|
|
lastseen = time.time()
|
|
knownnodes.knownNodes[stream][peer] = {
|
|
"lastseen": lastseen,
|
|
"rating": 0,
|
|
"self": self,
|
|
}
|
|
|
|
def knownNodes():
|
|
try:
|
|
with open(state.appdata + 'knownnodes.dat', 'rb') as pickleFile:
|
|
with knownnodes.knownNodesLock:
|
|
knownnodes.knownNodes = pickle.load(pickleFile)
|
|
# the old format was {Peer:lastseen, ...}
|
|
# the new format is {Peer:{"lastseen":i, "rating":f}}
|
|
for stream in knownnodes.knownNodes.keys():
|
|
for node, params in knownnodes.knownNodes[stream].items():
|
|
if isinstance(params, (float, int)):
|
|
addKnownNode(stream, node, params)
|
|
except:
|
|
knownnodes.knownNodes = defaultKnownNodes.createDefaultKnownNodes(state.appdata)
|
|
# your own onion address, if setup
|
|
if BMConfigParser().has_option('bitmessagesettings', 'onionhostname') and ".onion" in BMConfigParser().get('bitmessagesettings', 'onionhostname'):
|
|
addKnownNode(1, state.Peer(BMConfigParser().get('bitmessagesettings', 'onionhostname'), BMConfigParser().getint('bitmessagesettings', 'onionport')), self=True)
|
|
if BMConfigParser().getint('bitmessagesettings', 'settingsversion') > 10:
|
|
logger.error('Bitmessage cannot read future versions of the keys file (keys.dat). Run the newer version of Bitmessage.')
|
|
raise SystemExit
|
|
|
|
def dns():
|
|
# DNS bootstrap. This could be programmed to use the SOCKS proxy to do the
|
|
# DNS lookup some day but for now we will just rely on the entries in
|
|
# defaultKnownNodes.py. Hopefully either they are up to date or the user
|
|
# has run Bitmessage recently without SOCKS turned on and received good
|
|
# bootstrap nodes using that method.
|
|
if BMConfigParser().get('bitmessagesettings', 'socksproxytype') == 'none':
|
|
try:
|
|
for item in socket.getaddrinfo('bootstrap8080.bitmessage.org', 80):
|
|
logger.info('Adding ' + item[4][0] + ' to knownNodes based on DNS bootstrap method')
|
|
addKnownNode(1, state.Peer(item[4][0], 8080))
|
|
except:
|
|
logger.error('bootstrap8080.bitmessage.org DNS bootstrapping failed.')
|
|
try:
|
|
for item in socket.getaddrinfo('bootstrap8444.bitmessage.org', 80):
|
|
logger.info ('Adding ' + item[4][0] + ' to knownNodes based on DNS bootstrap method')
|
|
addKnownNode(1, state.Peer(item[4][0], 8444))
|
|
except:
|
|
logger.error('bootstrap8444.bitmessage.org DNS bootstrapping failed.')
|
|
elif BMConfigParser().get('bitmessagesettings', 'socksproxytype') == 'SOCKS5':
|
|
addKnownNode(1, state.Peer('quzwelsuziwqgpt2.onion', 8444))
|
|
logger.debug("Adding quzwelsuziwqgpt2.onion:8444 to knownNodes.")
|
|
for port in [8080, 8444]:
|
|
logger.debug("Resolving %i through SOCKS...", port)
|
|
address_family = socket.AF_INET
|
|
sock = socks.socksocket(address_family, socket.SOCK_STREAM)
|
|
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
|
sock.settimeout(20)
|
|
proxytype = socks.PROXY_TYPE_SOCKS5
|
|
sockshostname = BMConfigParser().get(
|
|
'bitmessagesettings', 'sockshostname')
|
|
socksport = BMConfigParser().getint(
|
|
'bitmessagesettings', 'socksport')
|
|
rdns = True # Do domain name lookups through the proxy; though this setting doesn't really matter since we won't be doing any domain name lookups anyway.
|
|
if BMConfigParser().getboolean('bitmessagesettings', 'socksauthentication'):
|
|
socksusername = BMConfigParser().get(
|
|
'bitmessagesettings', 'socksusername')
|
|
sockspassword = BMConfigParser().get(
|
|
'bitmessagesettings', 'sockspassword')
|
|
sock.setproxy(
|
|
proxytype, sockshostname, socksport, rdns, socksusername, sockspassword)
|
|
else:
|
|
sock.setproxy(
|
|
proxytype, sockshostname, socksport, rdns)
|
|
try:
|
|
ip = sock.resolve("bootstrap" + str(port) + ".bitmessage.org")
|
|
sock.shutdown(socket.SHUT_RDWR)
|
|
sock.close()
|
|
except:
|
|
logger.error("SOCKS DNS resolving failed", exc_info=True)
|
|
else:
|
|
if ip is not None:
|
|
logger.info ('Adding ' + ip + ' to knownNodes based on SOCKS DNS bootstrap method')
|
|
addKnownNode(1, state.Peer(ip, port))
|
|
else:
|
|
logger.info('DNS bootstrap skipped because the proxy type does not support DNS resolution.')
|