Merge pull request #1716 from TheBlueMatt/2022-09-log-unreadable-type

TheBlueMatt · web-flow · commit dbd0ab8cf8fc · 2022-09-12T18:10:47.000Z
Include the message type when we send unreadable gossip msg errors
diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
@@ -1127,7 +1127,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 												}
 												(_, Some(ty)) if is_gossip_msg(ty) => {
 													log_gossip!(self.logger, "Got an invalid value while deserializing a gossip message");
-													self.enqueue_message(peer, &msgs::WarningMessage { channel_id: [0; 32], data: "Unreadable/bogus gossip message".to_owned() });
+													self.enqueue_message(peer, &msgs::WarningMessage {
+														channel_id: [0; 32],
+														data: format!("Unreadable/bogus gossip message of type {}", ty),
+													});
 													continue;
 												}
 												(msgs::DecodeError::UnknownRequiredFeature, ty) => {

Original file line number	Diff line number	Diff line change
`@@ -1127,7 +1127,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM`
`1127`	`1127`	`}`
`1128`	`1128`	`(_, Some(ty)) if is_gossip_msg(ty) => {`
`1129`	`1129`	`log_gossip!(self.logger, "Got an invalid value while deserializing a gossip message");`
`1130`		`- self.enqueue_message(peer, &msgs::WarningMessage { channel_id: [0; 32], data: "Unreadable/bogus gossip message".to_owned() });`
	`1130`	`+ self.enqueue_message(peer, &msgs::WarningMessage {`
	`1131`	`+ channel_id: [0; 32],`
	`1132`	`+ data: format!("Unreadable/bogus gossip message of type {}", ty),`
	`1133`	`+ });`
`1131`	`1134`	`continue;`
`1132`	`1135`	`}`
`1133`	`1136`	`(msgs::DecodeError::UnknownRequiredFeature, ty) => {`