Skip to content

Commit bf00e7e

Browse files
PeerMan: rename drop_gossip method and fix bug
It's more accurate to name it as dropping gossip broadcasts, as it won't drop all gossip. Also fix accidental flipped bool introduced in #1660
1 parent 414d8e1 commit bf00e7e

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

lightning/src/ln/peer_handler.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -398,12 +398,9 @@ impl Peer {
398398
}
399399

400400
/// Returns whether this peer's buffer is full and we should drop gossip messages.
401-
fn buffer_full_drop_gossip(&self) -> bool {
402-
if self.pending_outbound_buffer.len() > OUTBOUND_BUFFER_LIMIT_DROP_GOSSIP
403-
|| self.msgs_sent_since_pong > BUFFER_DRAIN_MSGS_PER_TICK * FORWARD_INIT_SYNC_BUFFER_LIMIT_RATIO {
404-
return false
405-
}
406-
true
401+
fn buffer_full_drop_gossip_broadcast(&self) -> bool {
402+
self.pending_outbound_buffer.len() > OUTBOUND_BUFFER_LIMIT_DROP_GOSSIP ||
403+
self.msgs_sent_since_pong > BUFFER_DRAIN_MSGS_PER_TICK * FORWARD_INIT_SYNC_BUFFER_LIMIT_RATIO
407404
}
408405
}
409406

@@ -1325,7 +1322,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
13251322
!peer.should_forward_channel_announcement(msg.contents.short_channel_id) {
13261323
continue
13271324
}
1328-
if peer.buffer_full_drop_gossip() {
1325+
if peer.buffer_full_drop_gossip_broadcast() {
13291326
log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
13301327
continue;
13311328
}
@@ -1349,7 +1346,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
13491346
!peer.should_forward_node_announcement(msg.contents.node_id) {
13501347
continue
13511348
}
1352-
if peer.buffer_full_drop_gossip() {
1349+
if peer.buffer_full_drop_gossip_broadcast() {
13531350
log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
13541351
continue;
13551352
}
@@ -1372,7 +1369,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
13721369
!peer.should_forward_channel_announcement(msg.contents.short_channel_id) {
13731370
continue
13741371
}
1375-
if peer.buffer_full_drop_gossip() {
1372+
if peer.buffer_full_drop_gossip_broadcast() {
13761373
log_gossip!(self.logger, "Skipping broadcast message to {:?} as its outbound buffer is full", peer.their_node_id);
13771374
continue;
13781375
}

0 commit comments

Comments
 (0)