Peter Surda
fd1a6c1fa1
- dandelion fixes - try to wait as long as possible before expiration if there are no outbound connections - expire in invThread rather than singleCleaner thread - deduplication of code in inv and dinv command methods - turn on by default, seems to work correctly now - turn off dandelion if outbound connections are disabled - start tracking downloads earlier, and faster download loop - remove some obsolete lines - minor PEP8 updates
244 lines
10 KiB
Python
244 lines
10 KiB
Python
import errno
|
|
import socket
|
|
import time
|
|
import random
|
|
import re
|
|
|
|
from bmconfigparser import BMConfigParser
|
|
from debug import logger
|
|
import helper_bootstrap
|
|
from network.proxy import Proxy
|
|
from network.bmproto import BMProto
|
|
from network.dandelion import Dandelion
|
|
from network.tcp import TCPServer, Socks5BMConnection, Socks4aBMConnection, TCPConnection
|
|
from network.udp import UDPSocket
|
|
from network.connectionchooser import chooseConnection
|
|
import network.asyncore_pollchoose as asyncore
|
|
import protocol
|
|
from singleton import Singleton
|
|
import state
|
|
|
|
@Singleton
|
|
class BMConnectionPool(object):
|
|
def __init__(self):
|
|
asyncore.set_rates(
|
|
BMConfigParser().safeGetInt("bitmessagesettings", "maxdownloadrate"),
|
|
BMConfigParser().safeGetInt("bitmessagesettings", "maxuploadrate"))
|
|
self.outboundConnections = {}
|
|
self.inboundConnections = {}
|
|
self.listeningSockets = {}
|
|
self.udpSockets = {}
|
|
self.streams = []
|
|
self.lastSpawned = 0
|
|
self.spawnWait = 2
|
|
self.bootstrapped = False
|
|
|
|
def connectToStream(self, streamNumber):
|
|
self.streams.append(streamNumber)
|
|
|
|
def getConnectionByAddr(self, addr):
|
|
if addr in self.inboundConnections:
|
|
return self.inboundConnections[addr]
|
|
try:
|
|
if addr.host in self.inboundConnections:
|
|
return self.inboundConnections[addr.host]
|
|
except AttributeError:
|
|
pass
|
|
if addr in self.outboundConnections:
|
|
return self.outboundConnections[addr]
|
|
try:
|
|
if addr.host in self.udpSockets:
|
|
return self.udpSockets[addr.host]
|
|
except AttributeError:
|
|
pass
|
|
raise KeyError
|
|
|
|
def isAlreadyConnected(self, nodeid):
|
|
for i in self.inboundConnections.values() + self.outboundConnections.values():
|
|
try:
|
|
if nodeid == i.nodeid:
|
|
return True
|
|
except AttributeError:
|
|
pass
|
|
return False
|
|
|
|
def addConnection(self, connection):
|
|
if isinstance(connection, UDPSocket):
|
|
return
|
|
if connection.isOutbound:
|
|
self.outboundConnections[connection.destination] = connection
|
|
else:
|
|
if connection.destination.host in self.inboundConnections:
|
|
self.inboundConnections[connection.destination] = connection
|
|
else:
|
|
self.inboundConnections[connection.destination.host] = connection
|
|
|
|
def removeConnection(self, connection):
|
|
if isinstance(connection, UDPSocket):
|
|
del self.udpSockets[connection.listening.host]
|
|
elif isinstance(connection, TCPServer):
|
|
del self.listeningSockets[state.Peer(connection.destination.host, connection.destination.port)]
|
|
elif connection.isOutbound:
|
|
try:
|
|
del self.outboundConnections[connection.destination]
|
|
except KeyError:
|
|
pass
|
|
else:
|
|
try:
|
|
del self.inboundConnections[connection.destination]
|
|
except KeyError:
|
|
try:
|
|
del self.inboundConnections[connection.destination.host]
|
|
except KeyError:
|
|
pass
|
|
connection.close()
|
|
|
|
def getListeningIP(self):
|
|
if BMConfigParser().safeGet("bitmessagesettings", "onionhostname").endswith(".onion"):
|
|
host = BMConfigParser().safeGet("bitmessagesettings", "onionbindip")
|
|
else:
|
|
host = '127.0.0.1'
|
|
if BMConfigParser().safeGetBoolean("bitmessagesettings", "sockslisten") or \
|
|
BMConfigParser().get("bitmessagesettings", "socksproxytype") == "none":
|
|
# python doesn't like bind + INADDR_ANY?
|
|
#host = socket.INADDR_ANY
|
|
host = BMConfigParser().get("network", "bind")
|
|
return host
|
|
|
|
def startListening(self, bind=None):
|
|
if bind is None:
|
|
bind = self.getListeningIP()
|
|
port = BMConfigParser().safeGetInt("bitmessagesettings", "port")
|
|
# correct port even if it changed
|
|
ls = TCPServer(host=bind, port=port)
|
|
self.listeningSockets[ls.destination] = ls
|
|
|
|
def startUDPSocket(self, bind=None):
|
|
if bind is None:
|
|
host = self.getListeningIP()
|
|
udpSocket = UDPSocket(host=host, announcing=True)
|
|
else:
|
|
if bind is False:
|
|
udpSocket = UDPSocket(announcing=False)
|
|
else:
|
|
udpSocket = UDPSocket(host=bind, announcing=True)
|
|
self.udpSockets[udpSocket.listening.host] = udpSocket
|
|
|
|
def loop(self):
|
|
# defaults to empty loop if outbound connections are maxed
|
|
spawnConnections = False
|
|
acceptConnections = True
|
|
if BMConfigParser().safeGetBoolean('bitmessagesettings', 'dontconnect'):
|
|
acceptConnections = False
|
|
elif BMConfigParser().safeGetBoolean('bitmessagesettings', 'sendoutgoingconnections'):
|
|
spawnConnections = True
|
|
if BMConfigParser().get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and \
|
|
(not BMConfigParser().getboolean('bitmessagesettings', 'sockslisten') and \
|
|
".onion" not in BMConfigParser().get('bitmessagesettings', 'onionhostname')):
|
|
acceptConnections = False
|
|
|
|
if spawnConnections:
|
|
if not self.bootstrapped:
|
|
helper_bootstrap.dns()
|
|
self.bootstrapped = True
|
|
Proxy.proxy = (BMConfigParser().safeGet("bitmessagesettings", "sockshostname"),
|
|
BMConfigParser().safeGetInt("bitmessagesettings", "socksport"))
|
|
established = sum(1 for c in self.outboundConnections.values() if (c.connected and c.fullyEstablished))
|
|
pending = len(self.outboundConnections) - established
|
|
if established < BMConfigParser().safeGetInt("bitmessagesettings", "maxoutboundconnections"):
|
|
for i in range(state.maximumNumberOfHalfOpenConnections - pending):
|
|
try:
|
|
chosen = chooseConnection(random.choice(self.streams))
|
|
except ValueError:
|
|
continue
|
|
if chosen in self.outboundConnections:
|
|
continue
|
|
if chosen.host in self.inboundConnections:
|
|
continue
|
|
# don't connect to self
|
|
if chosen in state.ownAddresses:
|
|
continue
|
|
|
|
#for c in self.outboundConnections:
|
|
# if chosen == c.destination:
|
|
# continue
|
|
#for c in self.inboundConnections:
|
|
# if chosen.host == c.destination.host:
|
|
# continue
|
|
try:
|
|
if (BMConfigParser().safeGet("bitmessagesettings", "socksproxytype") == "SOCKS5"):
|
|
self.addConnection(Socks5BMConnection(chosen))
|
|
elif (BMConfigParser().safeGet("bitmessagesettings", "socksproxytype") == "SOCKS4a"):
|
|
self.addConnection(Socks4aBMConnection(chosen))
|
|
elif not chosen.host.endswith(".onion"):
|
|
self.addConnection(TCPConnection(chosen))
|
|
except socket.error as e:
|
|
if e.errno == errno.ENETUNREACH:
|
|
continue
|
|
|
|
self.lastSpawned = time.time()
|
|
else:
|
|
for i in (
|
|
self.inboundConnections.values() +
|
|
self.outboundConnections.values()
|
|
):
|
|
i.set_state("close")
|
|
# FIXME: rating will be increased after next connection
|
|
i.handle_close()
|
|
|
|
if acceptConnections:
|
|
if not self.listeningSockets:
|
|
if BMConfigParser().safeGet("network", "bind") == '':
|
|
self.startListening()
|
|
else:
|
|
for bind in re.sub("[^\w.]+", " ", BMConfigParser().safeGet("network", "bind")).split():
|
|
self.startListening(bind)
|
|
logger.info('Listening for incoming connections.')
|
|
if not self.udpSockets:
|
|
if BMConfigParser().safeGet("network", "bind") == '':
|
|
self.startUDPSocket()
|
|
else:
|
|
for bind in re.sub("[^\w.]+", " ", BMConfigParser().safeGet("network", "bind")).split():
|
|
self.startUDPSocket(bind)
|
|
self.startUDPSocket(False)
|
|
logger.info('Starting UDP socket(s).')
|
|
else:
|
|
if self.listeningSockets:
|
|
for i in self.listeningSockets.values():
|
|
i.close_reason = "Stopping listening"
|
|
i.accepting = i.connecting = i.connected = False
|
|
logger.info('Stopped listening for incoming connections.')
|
|
if self.udpSockets:
|
|
for i in self.udpSockets.values():
|
|
i.close_reason = "Stopping UDP socket"
|
|
i.accepting = i.connecting = i.connected = False
|
|
logger.info('Stopped udp sockets.')
|
|
|
|
loopTime = float(self.spawnWait)
|
|
if self.lastSpawned < time.time() - self.spawnWait:
|
|
loopTime = 2.0
|
|
asyncore.loop(timeout=loopTime, count=1000)
|
|
|
|
reaper = []
|
|
for i in self.inboundConnections.values() + self.outboundConnections.values():
|
|
minTx = time.time() - 20
|
|
if i.fullyEstablished:
|
|
minTx -= 300 - 20
|
|
if i.lastTx < minTx:
|
|
if i.fullyEstablished:
|
|
i.append_write_buf(protocol.CreatePacket('ping'))
|
|
else:
|
|
i.close_reason = "Timeout (%is)" % (time.time() - i.lastTx)
|
|
i.set_state("close")
|
|
for i in self.inboundConnections.values() + self.outboundConnections.values() + self.listeningSockets.values() + self.udpSockets.values():
|
|
if not (i.accepting or i.connecting or i.connected):
|
|
reaper.append(i)
|
|
else:
|
|
try:
|
|
if i.state == "close":
|
|
reaper.append(i)
|
|
except AttributeError:
|
|
pass
|
|
for i in reaper:
|
|
self.removeConnection(i)
|