From: Tibo-lg Date: Tue, 14 Sep 2021 06:40:10 +0000 (+0900) Subject: Add node id to custom message callback X-Git-Tag: v0.0.101~18^2 X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=2c6a078d2c8c9e947a6f4ee0fe42dcdc80ae9fc0;p=rust-lightning Add node id to custom message callback --- diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs index 34bcda3a0..3c6e6b191 100644 --- a/lightning/src/ln/peer_handler.rs +++ b/lightning/src/ln/peer_handler.rs @@ -47,7 +47,7 @@ use bitcoin::hashes::{HashEngine, Hash}; pub trait CustomMessageHandler: wire::CustomMessageReader { /// Called with the message type that was received and the buffer to be read. /// Can return a `MessageHandlingError` if the message could not be handled. - fn handle_custom_message(&self, msg: Self::CustomMessage) -> Result<(), LightningError>; + fn handle_custom_message(&self, msg: Self::CustomMessage, sender_node_id: &PublicKey) -> Result<(), LightningError>; /// Gets the list of pending messages which were generated by the custom message /// handler, clearing the list in the process. The first tuple element must @@ -102,7 +102,7 @@ impl wire::CustomMessageReader for IgnoringMessageHandler { } impl CustomMessageHandler for IgnoringMessageHandler { - fn handle_custom_message(&self, _msg: Self::CustomMessage) -> Result<(), LightningError> { + fn handle_custom_message(&self, _msg: Self::CustomMessage, _sender_node_id: &PublicKey) -> Result<(), LightningError> { // Since we always return `None` in the read the handle method should never be called. unreachable!(); } @@ -1087,7 +1087,7 @@ impl P log_trace!(self.logger, "Received unknown odd message of type {}, ignoring", type_id); }, wire::Message::Custom(custom) => { - self.custom_message_handler.handle_custom_message(custom)?; + self.custom_message_handler.handle_custom_message(custom, &peer.their_node_id.unwrap())?; }, }; Ok(should_forward)