Skip to content

Commit 876d690

Browse files
committed
Keep the same read buffer unless the last message was overly large
This avoids repeatedly deallocating-allocating a Vec for the peer read buffer after every message/header.
1 parent bacc578 commit 876d690

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lightning/src/ln/peer_handler.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
909909
if peer.pending_read_is_header {
910910
let msg_len = try_potential_handleerror!(peer,
911911
peer.channel_encryptor.decrypt_length_header(&peer.pending_read_buffer[..]));
912-
peer.pending_read_buffer = Vec::with_capacity(msg_len as usize + 16);
912+
if peer.pending_read_buffer.capacity() > 8192 { peer.pending_read_buffer = Vec::new(); }
913913
peer.pending_read_buffer.resize(msg_len as usize + 16, 0);
914914
if msg_len < 2 { // Need at least the message type tag
915915
return Err(PeerHandleError{ no_connection_possible: false });
@@ -921,7 +921,8 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
921921
assert!(msg_data.len() >= 2);
922922

923923
// Reset read buffer
924-
peer.pending_read_buffer = [0; 18].to_vec();
924+
if peer.pending_read_buffer.capacity() > 8192 { peer.pending_read_buffer = Vec::new(); }
925+
peer.pending_read_buffer.resize(18, 0);
925926
peer.pending_read_is_header = true;
926927

927928
let mut reader = io::Cursor::new(&msg_data[..]);

0 commit comments

Comments
 (0)