X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fln%2Fpeer_handler.rs;h=3122e572e57fafcbd90e1c08c6c10b146d152c29;hb=ecade5cf3843928078d1a5bb6d11daeb972eaa15;hp=f941f47dc10e5c99f13460b5aa82b96fba3a13c4;hpb=a3247abb4e9a13bf6b4817c7ce7a571d1d3e0063;p=rust-lightning

diff --git a/src/ln/peer_handler.rs b/src/ln/peer_handler.rs
index f941f47d..3122e572 100644
--- a/src/ln/peer_handler.rs
+++ b/src/ln/peer_handler.rs
@@ -331,21 +331,23 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 								($thing: expr) => {
 									match $thing {
 										Ok(x) => x,
-										Err(_e) => {
-											//TODO: Handle e?
-											return Err(PeerHandleError{ no_connection_possible: false });
-										}
-									};
-								}
-							}
-
-							macro_rules! try_ignore_potential_decodeerror {
-								($thing: expr) => {
-									match $thing {
-										Ok(x) => x,
-										Err(_e) => {
-											log_debug!(self, "Error decoding message, ignoring due to lnd spec incompatibility. See https://github.com/lightningnetwork/lnd/issues/1407");
-											continue;
+										Err(e) => {
+											match e {
+												msgs::DecodeError::UnknownRealmByte => return Err(PeerHandleError{ no_connection_possible: false }),
+												msgs::DecodeError::UnknownRequiredFeature => {
+													log_debug!(self, "Got a channel/node announcement with an known required feature flag, you may want to udpate!");
+													continue;
+												},
+												msgs::DecodeError::BadPublicKey => return Err(PeerHandleError{ no_connection_possible: false }),
+												msgs::DecodeError::BadSignature => return Err(PeerHandleError{ no_connection_possible: false }),
+												msgs::DecodeError::BadText => return Err(PeerHandleError{ no_connection_possible: false }),
+												msgs::DecodeError::ShortRead => return Err(PeerHandleError{ no_connection_possible: false }),
+												msgs::DecodeError::ExtraAddressesPerType => {
+													log_debug!(self, "Error decoding message, ignoring due to lnd spec incompatibility. See https://github.com/lightningnetwork/lnd/issues/1407");
+													continue;
+												},
+												msgs::DecodeError::BadLengthDescriptor => return Err(PeerHandleError{ no_connection_possible: false }),
+											}
 										}
 									};
 								}
@@ -576,12 +578,20 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 												}
 											},
 											257 => {
-												let msg = try_ignore_potential_decodeerror!(msgs::NodeAnnouncement::decode(&msg_data[2..]));
-												try_potential_handleerror!(self.message_handler.route_handler.handle_node_announcement(&msg));
+												let msg = try_potential_decodeerror!(msgs::NodeAnnouncement::decode(&msg_data[2..]));
+												let should_forward = try_potential_handleerror!(self.message_handler.route_handler.handle_node_announcement(&msg));
+
+												if should_forward {
+													// TODO: forward msg along to all our other peers!
+												}
 											},
 											258 => {
 												let msg = try_potential_decodeerror!(msgs::ChannelUpdate::decode(&msg_data[2..]));
-												try_potential_handleerror!(self.message_handler.route_handler.handle_channel_update(&msg));
+												let should_forward = try_potential_handleerror!(self.message_handler.route_handler.handle_channel_update(&msg));
+
+												if should_forward {
+													// TODO: forward msg along to all our other peers!
+												}
 											},
 											_ => {
 												if (msg_type & 1) == 0 {
@@ -697,7 +707,7 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 						Self::do_attempt_write_data(&mut descriptor, peer);
 						continue;
 					},
-					Event::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fulfill_htlcs, ref update_fail_htlcs, ref commitment_signed } } => {
+					Event::UpdateHTLCs { ref node_id, updates: msgs::CommitmentUpdate { ref update_add_htlcs, ref update_fulfill_htlcs, ref update_fail_htlcs, ref update_fail_malformed_htlcs, ref commitment_signed } } => {
 						log_trace!(self, "Handling UpdateHTLCs event in peer_handler for node {} with {} adds, {} fulfills, {} fails for channel {}",
 								log_pubkey!(node_id),
 								update_add_htlcs.len(),
@@ -716,6 +726,9 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 						for msg in update_fail_htlcs {
 							peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!(msg, 131)));
 						}
+						for msg in update_fail_malformed_htlcs {
+							peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!(msg, 135)));
+						}
 						peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!(commitment_signed, 132)));
 						Self::do_attempt_write_data(&mut descriptor, peer);
 						continue;