X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fpeer_handler.rs;h=6607d986affd062eee04fb987256d571cec88bb4;hb=1b3249a1929929170bba9d2553d7a9c8670193e5;hp=9157dc87dc2fc5e415de7679974bfe0de3a91f0c;hpb=f676f5585f46eefbababdc19a5a90d5e0c77f0ca;p=rust-lightning

diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
index 9157dc87..6607d986 100644
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@ -821,6 +821,11 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 													self.enqueue_message(peer, &msg);
 													continue;
 												},
+												msgs::ErrorAction::SendWarningMessage { msg, log_level } => {
+													log_given_level!(self.logger, log_level, "Error handling message{}; sending warning message with: {}", OptionalFromDebugger(&peer.their_node_id), e.err);
+													self.enqueue_message(peer, &msg);
+													continue;
+												},
 											}
 										}
 									}
@@ -1022,6 +1027,21 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 					return Err(PeerHandleError{ no_connection_possible: true }.into());
 				}
 			},
+			wire::Message::Warning(msg) => {
+				let mut data_is_printable = true;
+				for b in msg.data.bytes() {
+					if b < 32 || b > 126 {
+						data_is_printable = false;
+						break;
+					}
+				}
+
+				if data_is_printable {
+					log_debug!(self.logger, "Got warning message from {}: {}", log_pubkey!(peer.their_node_id.unwrap()), msg.data);
+				} else {
+					log_debug!(self.logger, "Got warning message from {} with non-ASCII error message", log_pubkey!(peer.their_node_id.unwrap()));
+				}
+			},
 
 			wire::Message::Ping(msg) => {
 				if msg.ponglen < 65532 {
@@ -1419,6 +1439,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 										msg.data);
 								self.enqueue_message(get_peer_for_forwarding!(node_id), msg);
 							},
+							msgs::ErrorAction::SendWarningMessage { ref msg, ref log_level } => {
+								log_given_level!(self.logger, *log_level, "Handling SendWarningMessage HandleError event in peer_handler for node {} with message {}",
+										log_pubkey!(node_id),
+										msg.data);
+								self.enqueue_message(get_peer_for_forwarding!(node_id), msg);
+							},
 						}
 					},
 					MessageSendEvent::SendChannelRangeQuery { ref node_id, ref msg } => {