X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fpeer_handler.rs;h=9df01489f214071d146f46cdb307180e1d01307e;hb=a20eef17c9af128b4c80fcd39f852c84e3917eac;hp=624c6494930dec39060b0119a933c4a81eaf1c7a;hpb=8e2974fc2a5871c33584f8b5c90b65a8450f2a5d;p=rust-lightning

diff --git a/src/ln/peer_handler.rs b/src/ln/peer_handler.rs
index 624c6494..9df01489 100644
--- a/src/ln/peer_handler.rs
+++ b/src/ln/peer_handler.rs
@@ -612,24 +612,40 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 						continue;
 					},
 					Event::BroadcastChannelAnnouncement { ref msg, ref update_msg } => {
-						let encoded_msg = encode_msg!(msg, 256);
-						let encoded_update_msg = encode_msg!(update_msg, 258);
+						if self.message_handler.route_handler.handle_channel_announcement(msg).is_ok() && self.message_handler.route_handler.handle_channel_update(update_msg).is_ok() {
+							let encoded_msg = encode_msg!(msg, 256);
+							let encoded_update_msg = encode_msg!(update_msg, 258);
 
-						for (ref descriptor, ref mut peer) in peers.peers.iter_mut() {
-							if !peer.channel_encryptor.is_ready_for_encryption() {
-								continue
-							}
-							match peer.their_node_id {
-								None => continue,
-								Some(their_node_id) => {
-									if their_node_id == msg.contents.node_id_1 || their_node_id == msg.contents.node_id_2 {
-										continue
+							for (ref descriptor, ref mut peer) in peers.peers.iter_mut() {
+								if !peer.channel_encryptor.is_ready_for_encryption() {
+									continue
+								}
+								match peer.their_node_id {
+									None => continue,
+									Some(their_node_id) => {
+										if their_node_id == msg.contents.node_id_1 || their_node_id == msg.contents.node_id_2 {
+											continue
+										}
 									}
 								}
+								peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encoded_msg[..]));
+								peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encoded_update_msg[..]));
+								Self::do_attempt_write_data(&mut (*descriptor).clone(), peer);
+							}
+						}
+						continue;
+					},
+					Event::BroadcastChannelUpdate { ref msg } => {
+						if self.message_handler.route_handler.handle_channel_update(msg).is_ok() {
+							let encoded_msg = encode_msg!(msg, 258);
+
+							for (ref descriptor, ref mut peer) in peers.peers.iter_mut() {
+								if !peer.channel_encryptor.is_ready_for_encryption() {
+									continue
+								}
+								peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encoded_msg[..]));
+								Self::do_attempt_write_data(&mut (*descriptor).clone(), peer);
 							}
-							peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encoded_msg[..]));
-							peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encoded_update_msg[..]));
-							Self::do_attempt_write_data(&mut (*descriptor).clone(), peer);
 						}
 						continue;
 					},