X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fpeer_handler.rs;h=ec7500190d7ec3b062636fca716e71805ffddb05;hb=1f013c9cc21dcde1b7581c9b5b2e32ba7dc2cf7f;hp=78ffcfd1de522d7c84eeefe347e1671ee3f50a88;hpb=f4729075cbfef9f99e8316335dd1e8d15671674d;p=rust-lightning

diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
index 78ffcfd1..ec750019 100644
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@ -27,13 +27,13 @@ use ln::wire;
 use ln::wire::Encode;
 use util::byte_utils;
 use util::events::{MessageSendEvent, MessageSendEventsProvider};
-use util::logger::{Logger, Level};
+use util::logger::Logger;
 use routing::network_graph::NetGraphMsgHandler;
 
 use prelude::*;
 use alloc::collections::LinkedList;
 use alloc::fmt::Debug;
-use std::sync::{Arc, Mutex};
+use sync::{Arc, Mutex};
 use core::sync::atomic::{AtomicUsize, Ordering};
 use core::{cmp, hash, fmt, mem};
 use core::ops::Deref;
@@ -888,15 +888,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref> PeerManager<D
 					return Err(PeerHandleError{ no_connection_possible: false }.into());
 				}
 
-				log_info!(
-					self.logger, "Received peer Init message: data_loss_protect: {}, initial_routing_sync: {}, upfront_shutdown_script: {}, gossip_queries: {}, static_remote_key: {}, unknown flags (local and global): {}",
-					if msg.features.supports_data_loss_protect() { "supported" } else { "not supported"},
-					if msg.features.initial_routing_sync() { "requested" } else { "not requested" },
-					if msg.features.supports_upfront_shutdown_script() { "supported" } else { "not supported"},
-					if msg.features.supports_gossip_queries() { "supported" } else { "not supported" },
-					if msg.features.supports_static_remote_key() { "supported" } else { "not supported"},
-					if msg.features.supports_unknown_bits() { "present" } else { "none" }
-				);
+				log_info!(self.logger, "Received peer Init message: {}", msg.features);
 
 				if msg.features.initial_routing_sync() {
 					peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
@@ -1264,6 +1256,12 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref> PeerManager<D
 							self.forward_broadcast_msg(peers, &wire::Message::ChannelUpdate(msg), None);
 						}
 					},
+					MessageSendEvent::SendChannelUpdate { ref node_id, ref msg } => {
+						log_trace!(self.logger, "Handling SendChannelUpdate event in peer_handler for node {} for channel {}",
+								log_pubkey!(node_id), msg.contents.short_channel_id);
+						let peer = get_peer_for_forwarding!(node_id);
+						peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!(msg)));
+					},
 					MessageSendEvent::PaymentFailureNetworkUpdate { ref update } => {
 						self.message_handler.route_handler.handle_htlc_fail_channel_update(update);
 					},
@@ -1441,7 +1439,7 @@ mod tests {
 	use bitcoin::secp256k1::key::{SecretKey, PublicKey};
 
 	use prelude::*;
-	use std::sync::{Arc, Mutex};
+	use sync::{Arc, Mutex};
 	use core::sync::atomic::Ordering;
 
 	#[derive(Clone)]