AaronFiore/electrum
1
0
Fork 0
Code Activity

lnpeer: fix ping behavior.

Browse Source 
- Do not send ping if messages have been received recently.
 - Do not send more than one ping.
 - Await pong before sending commitment_signed (per BOLT-2)
 - Lower ping time to 30s
This commit is contained in:
ThomasV
2022-05-30 09:30:18 +02:00
parent c1c6c01e87
commit cc1b4a5c90
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
electrum/lnpeer.py
View File

@@ -95,7 +95,8 @@ class Peer(Logger):
self.their_features = LnFeatures(0) # type: LnFeatures self.their_features = LnFeatures(0) # type: LnFeatures
self.node_ids = [self.pubkey, privkey_to_pubkey(self.privkey)] self.node_ids = [self.pubkey, privkey_to_pubkey(self.privkey)]
assert self.node_ids[0] != self.node_ids[1] assert self.node_ids[0] != self.node_ids[1]
self.ping_time = 0 self.last_message_time = 0
self.pong_event = asyncio.Event()
self.reply_channel_range = asyncio.Queue() self.reply_channel_range = asyncio.Queue()
# gossip uses a single queue to preserve message order # gossip uses a single queue to preserve message order
self.gossip_queue = asyncio.Queue() self.gossip_queue = asyncio.Queue()
@@ -187,10 +188,11 @@ class Peer(Logger):
def diagnostic_name(self): def diagnostic_name(self):
return self.lnworker.__class__.__name__ + ', ' + self.transport.name() return self.lnworker.__class__.__name__ + ', ' + self.transport.name()
def ping_if_required(self): async def ping_if_required(self):
if time.time() - self.ping_time > 120: if time.time() - self.last_message_time > 30:
self.send_message('ping', num_pong_bytes=4, byteslen=4) self.send_message('ping', num_pong_bytes=4, byteslen=4)
self.ping_time = time.time() self.pong_event.clear()
await self.pong_event.wait()
def process_message(self, message): def process_message(self, message):
try: try:
@@ -198,6 +200,7 @@ class Peer(Logger):
except UnknownOptionalMsgType as e: except UnknownOptionalMsgType as e:
self.logger.info(f"received unknown message from peer. ignoring: {e!r}") self.logger.info(f"received unknown message from peer. ignoring: {e!r}")
return return
self.last_message_time = time.time()
if message_type not in self.SPAMMY_MESSAGES: if message_type not in self.SPAMMY_MESSAGES:
self.logger.debug(f"Received {message_type.upper()}") self.logger.debug(f"Received {message_type.upper()}")
# only process INIT if we are a backup # only process INIT if we are a backup
@@ -319,7 +322,7 @@ class Peer(Logger):
self.send_message('pong', byteslen=l) self.send_message('pong', byteslen=l)
def on_pong(self, payload): def on_pong(self, payload):
pass self.pong_event.set()
async def wait_for_message(self, expected_name, channel_id): async def wait_for_message(self, expected_name, channel_id):
q = self.ordered_message_queues[channel_id] q = self.ordered_message_queues[channel_id]
@@ -2171,6 +2174,7 @@ class Peer(Logger):
async def htlc_switch(self): async def htlc_switch(self):
await self.initialized await self.initialized
while True: while True:
await self.ping_if_required()
self._htlc_switch_iterdone_event.set() self._htlc_switch_iterdone_event.set()
self._htlc_switch_iterdone_event.clear() self._htlc_switch_iterdone_event.clear()
# We poll every 0.1 sec to check if there is work to do, # We poll every 0.1 sec to check if there is work to do,
@@ -2184,7 +2188,6 @@ class Peer(Logger):
await group.spawn(self.downstream_htlc_resolved_event.wait()) await group.spawn(self.downstream_htlc_resolved_event.wait())
self._htlc_switch_iterstart_event.set() self._htlc_switch_iterstart_event.set()
self._htlc_switch_iterstart_event.clear() self._htlc_switch_iterstart_event.clear()
self.ping_if_required()
self._maybe_cleanup_received_htlcs_pending_removal() self._maybe_cleanup_received_htlcs_pending_removal()
for chan_id, chan in self.channels.items(): for chan_id, chan in self.channels.items():
if not chan.can_send_ctx_updates(): if not chan.can_send_ctx_updates():