X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fpeer_handler.rs;h=81ae8ca3863363e17aeca9ac6fb3bfc61a78bb04;hb=28c5f6f309ccf538ae9da0072fc66311f4e56684;hp=b102f947badef2d46cffe3391c6742b25df6a8fa;hpb=3e89106163b941aa4dc4ff92bdb484b7bbcf50c4;p=rust-lightning

diff --git a/src/ln/peer_handler.rs b/src/ln/peer_handler.rs
index b102f947..81ae8ca3 100644
--- a/src/ln/peer_handler.rs
+++ b/src/ln/peer_handler.rs
@@ -364,7 +364,7 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 												},
 												msgs::DecodeError::BadLengthDescriptor => return Err(PeerHandleError{ no_connection_possible: false }),
 												msgs::DecodeError::Io(_) => return Err(PeerHandleError{ no_connection_possible: false }),
-												msgs::DecodeError::InvalidValue => return Err(PeerHandleError{ no_connection_possible: false }),
+												msgs::DecodeError::InvalidValue => panic!("should not happen with message decoding"),
 											}
 										}
 									};
@@ -465,6 +465,10 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 														local_features,
 													}, 16);
 												}
+
+												for msg in self.message_handler.chan_handler.peer_connected(&peer.their_node_id.unwrap()) {
+													encode_and_send_msg!(msg, 136);
+												}
 											},
 											17 => {
 												let msg = try_potential_decodeerror!(msgs::ErrorMessage::read(&mut reader));
@@ -596,7 +600,31 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 												let msg = try_potential_decodeerror!(msgs::UpdateFee::read(&mut reader));
 												try_potential_handleerror!(self.message_handler.chan_handler.handle_update_fee(&peer.their_node_id.unwrap(), &msg));
 											},
-											136 => { }, // TODO: channel_reestablish
+											136 => {
+												let msg = try_potential_decodeerror!(msgs::ChannelReestablish::read(&mut reader));
+												let (funding_locked, revoke_and_ack, commitment_update) = try_potential_handleerror!(self.message_handler.chan_handler.handle_channel_reestablish(&peer.their_node_id.unwrap(), &msg));
+												if let Some(lock_msg) = funding_locked {
+													encode_and_send_msg!(lock_msg, 36);
+												}
+												if let Some(revoke_msg) = revoke_and_ack {
+													encode_and_send_msg!(revoke_msg, 133);
+												}
+												match commitment_update {
+													Some(resps) => {
+														for resp in resps.update_add_htlcs {
+															encode_and_send_msg!(resp, 128);
+														}
+														for resp in resps.update_fulfill_htlcs {
+															encode_and_send_msg!(resp, 130);
+														}
+														for resp in resps.update_fail_htlcs {
+															encode_and_send_msg!(resp, 131);
+														}
+														encode_and_send_msg!(resps.commitment_signed, 132);
+													},
+													None => {},
+												}
+											},
 
 											// Routing control:
 											259 => {