From a873398c9fed1cbc02ce1c2937301f32f076f1c9 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Thu, 28 Oct 2021 17:32:10 +0000 Subject: [PATCH] f rename awaiting_pong_tick_intervals for clarity --- lightning/src/ln/peer_handler.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs index a51c7ea5..afc7f143 100644 --- a/lightning/src/ln/peer_handler.rs +++ b/lightning/src/ln/peer_handler.rs @@ -860,7 +860,7 @@ impl P let features = InitFeatures::known(); let resp = msgs::Init { features }; self.enqueue_message(peer, &resp); - peer.awaiting_pong_tick_intervals = 0; + peer.awaiting_pong_timer_tick_intervals = 0; }, NextNoiseStep::ActThree => { let their_node_id = try_potential_handleerror!(peer.channel_encryptor.process_act_three(&peer.pending_read_buffer[..])); @@ -871,7 +871,7 @@ impl P let features = InitFeatures::known(); let resp = msgs::Init { features }; self.enqueue_message(peer, &resp); - peer.awaiting_pong_tick_intervals = 0; + peer.awaiting_pong_timer_tick_intervals = 0; }, NextNoiseStep::NoiseComplete => { if peer.pending_read_is_header { @@ -1536,26 +1536,26 @@ impl P if !peer.channel_encryptor.is_ready_for_encryption() || peer.their_node_id.is_none() { // The peer needs to complete its handshake before we can exchange messages. We // give peers one timer tick to complete handshake, reusing - // `awaiting_pong_tick_intervals` to track number of timer ticks taken for - // handshake completion. - if peer.awaiting_pong_tick_intervals != 0 { + // `awaiting_pong_timer_tick_intervals` to track number of timer ticks taken + // for handshake completion. + if peer.awaiting_pong_timer_tick_intervals != 0 { do_disconnect_peer = true; } else { - peer.awaiting_pong_tick_intervals = 1; + peer.awaiting_pong_timer_tick_intervals = 1; return true; } } - if peer.awaiting_pong_tick_intervals == -1 { + if peer.awaiting_pong_timer_tick_intervals == -1 { // Magic value set in `maybe_send_extra_ping`. - peer.awaiting_pong_tick_intervals = 1; + peer.awaiting_pong_timer_tick_intervals = 1; peer.received_message_since_timer_tick = false; return true; } if do_disconnect_peer - || (peer.awaiting_pong_timertick_intervals > 0 && !peer.received_message_since_timer_tick) - || peer.awaiting_pong_timertick_intervals as u64 > + || (peer.awaiting_pong_timer_tick_intervals > 0 && !peer.received_message_since_timer_tick) + || peer.awaiting_pong_timer_tick_intervals as u64 > MAX_BUFFER_DRAIN_TICK_INTERVALS_PER_PEER as u64 * peer_count as u64 { descriptors_needing_disconnect.push(descriptor.clone()); -- 2.30.2