X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fmsgs.rs;h=6c7c8cfc7281682af919360df1c892342277e820;hb=4ca5bcf8cfc5cb3868974028b23ab7829c21426b;hp=14c16e94b94de76e109baa50bb1044b0460150a5;hpb=c52825d5f1854f4ae71e5e2ec15d684c2672c4c4;p=rust-lightning

diff --git a/src/ln/msgs.rs b/src/ln/msgs.rs
index 14c16e94..6c7c8cfc 100644
--- a/src/ln/msgs.rs
+++ b/src/ln/msgs.rs
@@ -5,7 +5,7 @@ use bitcoin::network::serialize::{deserialize,serialize};
 use bitcoin::blockdata::script::Script;
 
 use std::error::Error;
-use std::fmt;
+use std::{cmp, fmt};
 use std::result::Result;
 
 use util::{byte_utils, internal_traits, events};
@@ -376,11 +376,6 @@ pub struct ChannelUpdate {
 
 /// Used to put an error message in a HandleError
 pub enum ErrorAction {
-	/// Indicates an inbound HTLC add resulted in a failure, and the UpdateFailHTLC provided in msg
-	/// should be sent back to the sender.
-	UpdateFailHTLC {
-		msg: UpdateFailHTLC
-	},
 	/// The peer took some action which made us think they were useless. Disconnect them.
 	DisconnectPeer {
 		msg: Option<ErrorMessage>
@@ -404,6 +399,7 @@ pub struct CommitmentUpdate {
 	pub update_add_htlcs: Vec<UpdateAddHTLC>,
 	pub update_fulfill_htlcs: Vec<UpdateFulfillHTLC>,
 	pub update_fail_htlcs: Vec<UpdateFailHTLC>,
+	pub update_fail_malformed_htlcs: Vec<UpdateFailMalformedHTLC>,
 	pub commitment_signed: CommitmentSigned,
 }
 
@@ -444,12 +440,14 @@ pub trait ChannelMessageHandler : events::EventsProvider + Send + Sync {
 	// Channel-to-announce:
 	fn handle_announcement_signatures(&self, their_node_id: &PublicKey, msg: &AnnouncementSignatures) -> Result<(), HandleError>;
 
-	// Informational:
+	// Error conditions:
 	/// Indicates a connection to the peer failed/an existing connection was lost. If no connection
 	/// is believed to be possible in the future (eg they're sending us messages we don't
 	/// understand or indicate they require unknown feature bits), no_connection_possible is set
 	/// and any outstanding channels should be failed.
 	fn peer_disconnected(&self, their_node_id: &PublicKey, no_connection_possible: bool);
+
+	fn handle_error(&self, their_node_id: &PublicKey, msg: &ErrorMessage);
 }
 
 pub trait RoutingMessageHandler : Send + Sync {
@@ -1629,11 +1627,9 @@ impl MsgDecodable for ErrorMessage {
 		if v.len() < 34 {
 			return Err(DecodeError::ShortRead);
 		}
-		let len = byte_utils::slice_to_be16(&v[32..34]);
-		if v.len() < 34 + len as usize {
-			return Err(DecodeError::ShortRead);
-		}
-		let data = match String::from_utf8(v[34..34 + len as usize].to_vec()) {
+		// Unlike most messages, BOLT 1 requires we truncate our read if the value is out of range
+		let len = cmp::min(byte_utils::slice_to_be16(&v[32..34]) as usize, v.len() - 34);
+		let data = match String::from_utf8(v[34..34 + len].to_vec()) {
 			Ok(s) => s,
 			Err(_) => return Err(DecodeError::BadText),
 		};
@@ -1658,7 +1654,7 @@ mod tests {
 	fn encoding_channel_reestablish_no_secret() {
 		let public_key = {
 			let secp_ctx = Secp256k1::new();
-			PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap()).unwrap()
+			PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap())
 		};
 
 		let cr = msgs::ChannelReestablish {
@@ -1680,7 +1676,7 @@ mod tests {
 	fn encoding_channel_reestablish_with_secret() {
 		let public_key = {
 			let secp_ctx = Secp256k1::new();
-			PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap()).unwrap()
+			PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&secp_ctx, &hex::decode("0101010101010101010101010101010101010101010101010101010101010101").unwrap()[..]).unwrap())
 		};
 
 		let cr = msgs::ChannelReestablish {