X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fpeer_handler.rs;h=94cdef9e41fe76f7fa568edba784961edaeb8825;hb=c662dd3e946749f2c4a4c7e3169963d4e7906048;hp=81ef41cf789d05aff4f25f659e97f1716e324d5d;hpb=270d1bd00636942fcf359b4abdc5681ebe15307d;p=rust-lightning

diff --git a/src/ln/peer_handler.rs b/src/ln/peer_handler.rs
index 81ef41cf..94cdef9e 100644
--- a/src/ln/peer_handler.rs
+++ b/src/ln/peer_handler.rs
@@ -658,30 +658,44 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 											},
 											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));
+												let (funding_locked, revoke_and_ack, commitment_update, order) = 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);
-														}
-														if let Some(resp) = resps.update_fee {
-															encode_and_send_msg!(resp, 134);
-														}
-														encode_and_send_msg!(resps.commitment_signed, 132);
+												macro_rules! handle_raa { () => {
+													if let Some(revoke_msg) = revoke_and_ack {
+														encode_and_send_msg!(revoke_msg, 133);
+													}
+												} }
+												macro_rules! handle_cu { () => {
+													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);
+															}
+															if let Some(resp) = resps.update_fee {
+																encode_and_send_msg!(resp, 134);
+															}
+															encode_and_send_msg!(resps.commitment_signed, 132);
+														},
+														None => {},
+													}
+												} }
+												match order {
+													msgs::RAACommitmentOrder::RevokeAndACKFirst => {
+														handle_raa!();
+														handle_cu!();
+													},
+													msgs::RAACommitmentOrder::CommitmentFirst => {
+														handle_cu!();
+														handle_raa!();
 													},
-													None => {},
 												}
 											},
 
@@ -852,6 +866,17 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 						Self::do_attempt_write_data(&mut descriptor, peer);
 						continue;
 					},
+					Event::SendRevokeAndACK { ref node_id, ref msg } => {
+						log_trace!(self, "Handling SendRevokeAndACK event in peer_handler for node {} for channel {}",
+								log_pubkey!(node_id),
+								log_bytes!(msg.channel_id));
+						let (mut descriptor, peer) = get_peer_for_forwarding!(node_id, {
+								//TODO: Do whatever we're gonna do for handling dropped messages
+							});
+						peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!(msg, 133)));
+						Self::do_attempt_write_data(&mut descriptor, peer);
+						continue;
+					},
 					Event::SendShutdown { ref node_id, ref msg } => {
 						log_trace!(self, "Handling Shutdown event in peer_handler for node {} for channel {}",
 								log_pubkey!(node_id),