LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

qa: mininode learns when a socket connects, not its first action

Browse source
This commit is contained in:
Matt Corallo 2017-02-07 17:35:57 -05:00
parent 2cbd1196b7
commit 8aaba7a6b7
1 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
qa/rpc-tests/test_framework/mininode.py
View file

@ -1614,7 +1614,7 @@ class NodeConn(asyncore.dispatcher):
"regtest": b"\xfa\xbf\xb5\xda", # regtest "regtest": b"\xfa\xbf\xb5\xda", # regtest
} }
def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK): def __init__(self, dstaddr, dstport, rpc, callback, net="regtest", services=NODE_NETWORK, send_version=True):
asyncore.dispatcher.__init__(self, map=mininode_socket_map) asyncore.dispatcher.__init__(self, map=mininode_socket_map)
self.log = logging.getLogger("NodeConn(%s:%d)" % (dstaddr, dstport)) self.log = logging.getLogger("NodeConn(%s:%d)" % (dstaddr, dstport))
self.dstaddr = dstaddr self.dstaddr = dstaddr
@ -1631,14 +1631,16 @@ class NodeConn(asyncore.dispatcher):
self.disconnect = False self.disconnect = False
self.nServices = 0 self.nServices = 0
# stuff version msg into sendbuf if send_version:
vt = msg_version() # stuff version msg into sendbuf
vt.nServices = services vt = msg_version()
vt.addrTo.ip = self.dstaddr vt.nServices = services
vt.addrTo.port = self.dstport vt.addrTo.ip = self.dstaddr
vt.addrFrom.ip = "0.0.0.0" vt.addrTo.port = self.dstport
vt.addrFrom.port = 0 vt.addrFrom.ip = "0.0.0.0"
self.send_message(vt, True) vt.addrFrom.port = 0
self.send_message(vt, True)
print('MiniNode: Connecting to Bitcoin Node IP # ' + dstaddr + ':' \ print('MiniNode: Connecting to Bitcoin Node IP # ' + dstaddr + ':' \
+ str(dstport)) + str(dstport))
@ -1652,8 +1654,9 @@ class NodeConn(asyncore.dispatcher):
self.log.debug(msg) self.log.debug(msg)
def handle_connect(self): def handle_connect(self):
self.show_debug_msg("MiniNode: Connected & Listening: \n") if self.state != "connected":
self.state = "connected" self.show_debug_msg("MiniNode: Connected & Listening: \n")
self.state = "connected"
def handle_close(self): def handle_close(self):
self.show_debug_msg("MiniNode: Closing Connection to %s:%d... " self.show_debug_msg("MiniNode: Closing Connection to %s:%d... "
@ -1681,11 +1684,20 @@ class NodeConn(asyncore.dispatcher):
def writable(self): def writable(self):
with mininode_lock: with mininode_lock:
pre_connection = self.state == "connecting"
length = len(self.sendbuf) length = len(self.sendbuf)
return (length > 0) return (length > 0 or pre_connection)
def handle_write(self): def handle_write(self):
with mininode_lock: with mininode_lock:
# asyncore does not expose socket connection, only the first read/write
# event, thus we must check connection manually here to know when we
# actually connect
if self.state == "connecting":
self.handle_connect()
if not self.writable():
return
try: try:
sent = self.send(self.sendbuf) sent = self.send(self.sendbuf)
except: except: