Implement Writer/Reader

with additional variants in DecodeError

Author: yuntai

fuzz/fuzz_targets/channel_target.rs

@@ -131,6 +131,8 @@ pub fn do_test(data: &[u8]) {
 					msgs::DecodeError::ExtraAddressesPerType => return,
 					msgs::DecodeError::BadLengthDescriptor => return,
 					msgs::DecodeError::ShortRead => panic!("We picked the length..."),
+					msgs::DecodeError::InvalidValue => panic!("Writeable not used yet..."),
+					msgs::DecodeError::Io(_) => panic!("Writeable not used yet..."),
 				}
 			}
 		}
@@ -154,6 +156,8 @@ pub fn do_test(data: &[u8]) {
 						msgs::DecodeError::ExtraAddressesPerType => return,
 						msgs::DecodeError::BadLengthDescriptor => return,
 						msgs::DecodeError::ShortRead => panic!("We picked the length..."),
+						msgs::DecodeError::InvalidValue => panic!("Writeable not used yet..."),
+						msgs::DecodeError::Io(_) => panic!("Writeable not used yet..."),
 					}
 				}
 			}

fuzz/fuzz_targets/router_target.rs

@@ -131,6 +131,8 @@ pub fn do_test(data: &[u8]) {
 					msgs::DecodeError::ExtraAddressesPerType => return,
 					msgs::DecodeError::BadLengthDescriptor => return,
 					msgs::DecodeError::ShortRead => panic!("We picked the length..."),
+					msgs::DecodeError::InvalidValue => panic!("Writeable not used yet..."),
+					msgs::DecodeError::Io(_) => panic!("Writeable not used yet..."),
 				}
 			}
 		}

src/ln/msgs.rs

@@ -43,6 +43,10 @@ pub enum DecodeError {
 	/// A length descriptor in the packet didn't describe the later data correctly
 	/// (currently only generated in node_announcement)
 	BadLengthDescriptor,
+	/// Error from std::io
+	Io(::std::io::Error),
+	/// Invalid value found when decoding
+	InvalidValue,
 }
 pub trait MsgDecodable: Sized {
 	fn decode(v: &[u8]) -> Result<Self, DecodeError>;
@@ -519,6 +523,8 @@ impl Error for DecodeError {
 			DecodeError::ShortRead => "Packet extended beyond the provided bytes",
 			DecodeError::ExtraAddressesPerType => "More than one address of a single type",
 			DecodeError::BadLengthDescriptor => "A length descriptor in the packet didn't describe the later data correctly",
+			DecodeError::Io(ref e) => e.description(),
+			DecodeError::InvalidValue => "Invalid value in the bytes",
 		}
 	}
 }
@@ -534,6 +540,16 @@ impl fmt::Debug for HandleError {
 	}
 }
 
+impl From<::std::io::Error> for DecodeError {
+	fn from(e: ::std::io::Error) -> Self {
+		if e.kind() == ::std::io::ErrorKind::UnexpectedEof {
+			DecodeError::ShortRead
+		} else {
+			DecodeError::Io(e)
+		}
+	}
+}
+
 macro_rules! secp_pubkey {
 	( $ctx: expr, $slice: expr ) => {
 		match PublicKey::from_slice($ctx, $slice) {

src/ln/peer_handler.rs

@@ -363,6 +363,9 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 													continue;
 												},
 												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::InvalidLength => return Err(PeerHandleError{ no_connection_possible: false }),
 											}
 										}
 									};

src/util/mod.rs

@@ -21,4 +21,11 @@ pub(crate) mod test_utils;
 #[macro_use]
 pub(crate) mod macro_logger;
 
+#[cfg(feature = "fuzztarget")]
+#[macro_use]
+pub mod ser;
+#[cfg(not(feature = "fuzztarget"))]
+#[macro_use]
+pub(crate) mod ser;
+
 pub mod logger;