X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fpeer_handler.rs;h=2b60bbf122bce3af47a16997afe48740ede9805a;hb=f47ba769f544c4fd2e2d1aa0bd5b1fa74ae15daa;hp=74848ad77b361d55741f36368c8534e7420f12b7;hpb=4150c281e7fe5a3bd524ae18bf264a9fe9006e37;p=rust-lightning

diff --git a/src/ln/peer_handler.rs b/src/ln/peer_handler.rs
index 74848ad7..2b60bbf1 100644
--- a/src/ln/peer_handler.rs
+++ b/src/ln/peer_handler.rs
@@ -299,7 +299,7 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 										let msg_len = try_potential_handleerror!(peer.channel_encryptor.decrypt_length_header(&peer.pending_read_buffer[..]));
 										peer.pending_read_buffer = Vec::with_capacity(msg_len as usize + 16);
 										peer.pending_read_buffer.resize(msg_len as usize + 16, 0);
-										if msg_len < 2 + 16 { // Need at least the message type tag
+										if msg_len < 2 { // Need at least the message type tag
 											return Err(PeerHandleError{});
 										}
 										peer.pending_read_is_header = false;
@@ -502,6 +502,8 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 					Event::FundingGenerationReady {..} => { /* Hand upstream */ },
 					Event::FundingBroadcastSafe {..} => { /* Hand upstream */ },
 					Event::PaymentReceived {..} => { /* Hand upstream */ },
+					Event::PaymentSent {..} => { /* Hand upstream */ },
+					Event::PaymentFailed {..} => { /* Hand upstream */ },
 
 					Event::PendingHTLCsForwardable {..} => {
 						//TODO: Handle upstream in some confused form so that upstream just knows
@@ -547,6 +549,14 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 						Self::do_attempt_write_data(&mut descriptor, peer);
 						continue;
 					},
+					Event::SendFailHTLC { ref node_id, ref msg } => {
+						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, 131)));
+						Self::do_attempt_write_data(&mut descriptor, peer);
+						continue;
+					},
 					Event::BroadcastChannelAnnouncement { ref msg, ref update_msg } => {
 						let encoded_msg = encode_msg!(msg, 256);
 						let encoded_update_msg = encode_msg!(update_msg, 258);