X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fmsgs.rs;h=f0f1d4890e13370f83cc3c8c633da57f7b03ce20;hb=d7b33fcd847f5480e438b2df176449d73f582090;hp=0a86b031eb1755401337fcf21ee051075536414e;hpb=5481a5d653482cfccddeae78a26e14240804a7df;p=rust-lightning

diff --git a/src/ln/msgs.rs b/src/ln/msgs.rs
index 0a86b031..f0f1d489 100644
--- a/src/ln/msgs.rs
+++ b/src/ln/msgs.rs
@@ -357,7 +357,9 @@ pub enum ErrorAction {
 		msg: UpdateFailHTLC
 	},
 	/// The peer took some action which made us think they were useless. Disconnect them.
-	DisconnectPeer {},
+	DisconnectPeer,
+	/// The peer did something harmless that we weren't able to process, just log and ignore
+	IgnoreError,
 }
 
 pub struct HandleError { //TODO: rename me
@@ -506,7 +508,7 @@ macro_rules! secp_signature {
 
 impl MsgDecodable for LocalFeatures {
 	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 3 { return Err(DecodeError::WrongLength); }
+		if v.len() < 2 { return Err(DecodeError::WrongLength); }
 		let len = byte_utils::slice_to_be16(&v[0..2]) as usize;
 		if v.len() < len + 2 { return Err(DecodeError::WrongLength); }
 		let mut flags = Vec::with_capacity(len);
@@ -528,7 +530,7 @@ impl MsgEncodable for LocalFeatures {
 
 impl MsgDecodable for GlobalFeatures {
 	fn decode(v: &[u8]) -> Result<Self, DecodeError> {
-		if v.len() < 3 { return Err(DecodeError::WrongLength); }
+		if v.len() < 2 { return Err(DecodeError::WrongLength); }
 		let len = byte_utils::slice_to_be16(&v[0..2]) as usize;
 		if v.len() < len + 2 { return Err(DecodeError::WrongLength); }
 		let mut flags = Vec::with_capacity(len);