# message fuzz targets
[[bin]]
name = "msg_ping_target"
-path = "fuzz_targets/msg_ping_target.rs"
+path = "fuzz_targets/msg_targets/msg_ping_target.rs"
[[bin]]
name = "msg_pong_target"
-path = "fuzz_targets/msg_pong_target.rs"
+path = "fuzz_targets/msg_targets/msg_pong_target.rs"
[[bin]]
name = "msg_error_message_target"
use lightning::ln::channel::{Channel, ChannelKeys};
use lightning::ln::channelmanager::{HTLCFailReason, HTLCSource, PendingHTLCStatus};
use lightning::ln::msgs;
-use lightning::ln::msgs::{MsgDecodable, ErrorAction};
+use lightning::ln::msgs::{ErrorAction};
use lightning::chain::chaininterface::{FeeEstimator, ConfirmationTarget};
use lightning::chain::transaction::OutPoint;
use lightning::util::reset_rng_state;
use lightning::util::logger::Logger;
+use lightning::util::ser::{Readable, Reader};
mod utils;
}
macro_rules! decode_msg {
- ($MsgType: path, $len: expr) => {
- match <($MsgType)>::decode(get_slice!($len)) {
+ ($MsgType: path, $len: expr) => {{
+ let mut reader = Reader::new(::std::io::Cursor::new(get_slice!($len)));
+ match <($MsgType)>::read(&mut reader) {
Ok(msg) => msg,
Err(e) => match e {
msgs::DecodeError::UnknownRealmByte => return,
msgs::DecodeError::ExtraAddressesPerType => return,
msgs::DecodeError::BadLengthDescriptor => return,
msgs::DecodeError::ShortRead => panic!("We picked the length..."),
+ msgs::DecodeError::InvalidValue => panic!("Should not happen with p2p message decoding"),
+ msgs::DecodeError::Io(e) => panic!(format!("{}", e)),
}
}
- }
+ }}
}
macro_rules! decode_msg_with_len16 {
Some(slice) => slice,
None => return,
}[$begin_len..$begin_len + 2]);
- match <($MsgType)>::decode(get_slice!($begin_len as usize + 2 + (extra_len as usize)*$factor)) {
- Ok(msg) => msg,
- Err(e) => match e {
- msgs::DecodeError::UnknownRealmByte => return,
- msgs::DecodeError::UnknownRequiredFeature => return,
- msgs::DecodeError::BadPublicKey => return,
- msgs::DecodeError::BadSignature => return,
- msgs::DecodeError::BadText => return,
- msgs::DecodeError::ExtraAddressesPerType => return,
- msgs::DecodeError::BadLengthDescriptor => return,
- msgs::DecodeError::ShortRead => panic!("We picked the length..."),
- }
- }
+ decode_msg!($MsgType, $begin_len as usize + 2 + (extra_len as usize)*$factor)
}
}
}
+++ /dev/null
-// This file is auto-generated by gen_target.sh based on msg_target_template.txt
-// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
-
-extern crate lightning;
-
-use lightning::util::reset_rng_state;
-
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable, Ping};
-
-#[inline]
-pub fn do_test(data: &[u8]) {
- reset_rng_state();
- if let Ok(msg) = Ping::decode(data) {
- let _ = msg.encode();
- }
-}
-
-#[cfg(feature = "afl")]
-#[macro_use] extern crate afl;
-#[cfg(feature = "afl")]
-fn main() {
- fuzz!(|data| {
- do_test(data);
- });
-}
-
-#[cfg(feature = "honggfuzz")]
-#[macro_use] extern crate honggfuzz;
-#[cfg(feature = "honggfuzz")]
-fn main() {
- loop {
- fuzz!(|data| {
- do_test(data);
- });
- }
-}
-
-extern crate hex;
-#[cfg(test)]
-mod tests {
- #[test]
- fn duplicate_crash() {
- super::do_test(&::hex::decode("00").unwrap());
- }
-}
+++ /dev/null
-// This file is auto-generated by gen_target.sh based on msg_target_template.txt
-// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
-
-extern crate lightning;
-
-use lightning::util::reset_rng_state;
-
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable, Pong};
-
-#[inline]
-pub fn do_test(data: &[u8]) {
- reset_rng_state();
- if let Ok(msg) = Pong::decode(data) {
- let _ = msg.encode();
- }
-}
-
-#[cfg(feature = "afl")]
-#[macro_use] extern crate afl;
-#[cfg(feature = "afl")]
-fn main() {
- fuzz!(|data| {
- do_test(data);
- });
-}
-
-#[cfg(feature = "honggfuzz")]
-#[macro_use] extern crate honggfuzz;
-#[cfg(feature = "honggfuzz")]
-fn main() {
- loop {
- fuzz!(|data| {
- do_test(data);
- });
- }
-}
-
-extern crate hex;
-#[cfg(test)]
-mod tests {
- #[test]
- fn duplicate_crash() {
- super::do_test(&::hex::decode("00").unwrap());
- }
-}
GEN_TEST UpdateAddHTLC test_msg_hole ", 85, 33"
GEN_TEST ErrorMessage test_msg_hole ", 32, 2"
GEN_TEST OnionHopData test_msg_hole ", 1+8+8+4, 12"
+
+GEN_TEST Ping test_msg_simple ""
+GEN_TEST Pong test_msg_simple ""
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
--- /dev/null
+// This file is auto-generated by gen_target.sh based on msg_target_template.txt
+// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
+
+extern crate lightning;
+
+use lightning::ln::msgs;
+use lightning::util::reset_rng_state;
+
+mod utils;
+
+#[inline]
+pub fn do_test(data: &[u8]) {
+ reset_rng_state();
+ test_msg_simple!(msgs::Ping, data);
+}
+
+#[cfg(feature = "afl")]
+#[macro_use] extern crate afl;
+#[cfg(feature = "afl")]
+fn main() {
+ fuzz!(|data| {
+ do_test(data);
+ });
+}
+
+#[cfg(feature = "honggfuzz")]
+#[macro_use] extern crate honggfuzz;
+#[cfg(feature = "honggfuzz")]
+fn main() {
+ loop {
+ fuzz!(|data| {
+ do_test(data);
+ });
+ }
+}
+
+extern crate hex;
+#[cfg(test)]
+mod tests {
+ #[test]
+ fn duplicate_crash() {
+ super::do_test(&::hex::decode("00").unwrap());
+ }
+}
--- /dev/null
+// This file is auto-generated by gen_target.sh based on msg_target_template.txt
+// To modify it, modify msg_target_template.txt and run gen_target.sh instead.
+
+extern crate lightning;
+
+use lightning::ln::msgs;
+use lightning::util::reset_rng_state;
+
+mod utils;
+
+#[inline]
+pub fn do_test(data: &[u8]) {
+ reset_rng_state();
+ test_msg_simple!(msgs::Pong, data);
+}
+
+#[cfg(feature = "afl")]
+#[macro_use] extern crate afl;
+#[cfg(feature = "afl")]
+fn main() {
+ fuzz!(|data| {
+ do_test(data);
+ });
+}
+
+#[cfg(feature = "honggfuzz")]
+#[macro_use] extern crate honggfuzz;
+#[cfg(feature = "honggfuzz")]
+fn main() {
+ loop {
+ fuzz!(|data| {
+ do_test(data);
+ });
+ }
+}
+
+extern crate hex;
+#[cfg(test)]
+mod tests {
+ #[test]
+ fn duplicate_crash() {
+ super::do_test(&::hex::decode("00").unwrap());
+ }
+}
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
use lightning::ln::msgs;
use lightning::util::reset_rng_state;
-use lightning::ln::msgs::{MsgEncodable, MsgDecodable};
-
mod utils;
#[inline]
macro_rules! test_msg {
($MsgType: path, $data: ident) => {
{
- if let Ok(msg) = <$MsgType as MsgDecodable>::decode($data){
- let enc = msg.encode();
- assert_eq!(&$data[..enc.len()], &enc[..]);
+ use lightning::util::ser::{Writer, Reader, Writeable, Readable};
+ let mut r = Reader::new(::std::io::Cursor::new($data));
+ if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+ let p = r.get_ref().position() as usize;
+ let mut w = Writer::new(::std::io::Cursor::new(vec![]));
+ msg.write(&mut w).unwrap();
+
+ let buf = w.into_inner().into_inner();
+ assert_eq!(buf.len(), p);
+ assert_eq!(&r.into_inner().into_inner()[..p], &buf[..p]);
+ }
+ }
+ }
+}
+
+#[macro_export]
+macro_rules! test_msg_simple {
+ ($MsgType: path, $data: ident) => {
+ {
+ use lightning::util::ser::{Writer, Reader, Writeable, Readable};
+ let mut r = Reader::new(::std::io::Cursor::new($data));
+ if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+ msg.write(&mut Writer::new(::std::io::Cursor::new(vec![]))).unwrap();
}
}
}
macro_rules! test_msg_exact {
($MsgType: path, $data: ident) => {
{
- if let Ok(msg) = <$MsgType as MsgDecodable>::decode($data){
- let enc = msg.encode();
- assert_eq!(&$data[..], &enc[..]);
+ use lightning::util::ser::{Writer, Reader, Writeable, Readable};
+ let mut r = Reader::new(::std::io::Cursor::new($data));
+ if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+ let mut w = Writer::new(::std::io::Cursor::new(vec![]));
+ msg.write(&mut w).unwrap();
+
+ let buf = w.into_inner().into_inner();
+ assert_eq!(&r.into_inner().into_inner()[..], &buf[..]);
}
}
}
macro_rules! test_msg_hole {
($MsgType: path, $data: ident, $hole: expr, $hole_len: expr) => {
{
- if let Ok(msg) = <$MsgType as MsgDecodable>::decode($data){
- let enc = msg.encode();
- assert_eq!(&$data[..$hole], &enc[..$hole]);
- assert_eq!(&$data[$hole + $hole_len..enc.len()], &enc[$hole + $hole_len..]);
+ use lightning::util::ser::{Writer, Reader, Writeable, Readable};
+ let mut r = Reader::new(::std::io::Cursor::new($data));
+ if let Ok(msg) = <$MsgType as Readable<::std::io::Cursor<&[u8]>>>::read(&mut r) {
+ let mut w = Writer::new(::std::io::Cursor::new(vec![]));
+ msg.write(&mut w).unwrap();
+ let p = w.get_ref().position() as usize;
+
+ let buf = w.into_inner().into_inner();
+ assert_eq!(buf.len(),p);
+ assert_eq!(&r.get_ref().get_ref()[..$hole], &buf[..$hole]);
+ assert_eq!(&r.get_ref().get_ref()[$hole+$hole_len..p], &buf[$hole+$hole_len..]);
}
}
}
use lightning::chain::chaininterface::{ChainError,ChainWatchInterface, ChainListener};
use lightning::ln::channelmanager::ChannelDetails;
use lightning::ln::msgs;
-use lightning::ln::msgs::{MsgDecodable, RoutingMessageHandler};
+use lightning::ln::msgs::{RoutingMessageHandler};
use lightning::ln::router::{Router, RouteHint};
use lightning::util::reset_rng_state;
use lightning::util::logger::Logger;
+use lightning::util::ser::{Reader, Readable};
use secp256k1::key::PublicKey;
use secp256k1::Secp256k1;
}
macro_rules! decode_msg {
- ($MsgType: path, $len: expr) => {
- match <($MsgType)>::decode(get_slice!($len)) {
+ ($MsgType: path, $len: expr) => {{
+ let mut reader = Reader::new(::std::io::Cursor::new(get_slice!($len)));
+ match <($MsgType)>::read(&mut reader) {
Ok(msg) => msg,
Err(e) => match e {
msgs::DecodeError::UnknownRealmByte => return,
msgs::DecodeError::ExtraAddressesPerType => return,
msgs::DecodeError::BadLengthDescriptor => return,
msgs::DecodeError::ShortRead => panic!("We picked the length..."),
+ msgs::DecodeError::InvalidValue => panic!("Should not happen with p2p message decoding"),
+ msgs::DecodeError::Io(e) => panic!(format!("{}", e)),
}
}
- }
+ }}
}
macro_rules! decode_msg_with_len16 {
use std::result::Result;
use util::{byte_utils, internal_traits, events};
+use util::ser::{Readable, Reader, Writeable, Writer};
pub trait MsgEncodable {
fn encode(&self) -> Vec<u8>;
/// 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),
+ /// 1 or 0 is not found for boolean value
+ InvalidValue,
}
pub trait MsgDecodable: Sized {
fn decode(v: &[u8]) -> Result<Self, 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 => "0 or 1 is not found for boolean",
}
}
}
}
}
+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) {
}
}
+impl_writeable!(AcceptChannel, {
+ temporary_channel_id,
+ dust_limit_satoshis,
+ max_htlc_value_in_flight_msat,
+ channel_reserve_satoshis,
+ htlc_minimum_msat,
+ minimum_depth,
+ to_self_delay,
+ max_accepted_htlcs,
+ funding_pubkey,
+ revocation_basepoint,
+ payment_basepoint,
+ delayed_payment_basepoint,
+ htlc_basepoint,
+ first_per_commitment_point,
+ shutdown_scriptpubkey
+});
+
+impl_writeable!(AnnouncementSignatures, {
+ channel_id,
+ short_channel_id,
+ node_signature,
+ bitcoin_signature
+});
+
+impl<W: ::std::io::Write> Writeable<W> for ChannelReestablish {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.channel_id.write(w)?;
+ self.next_local_commitment_number.write(w)?;
+ self.next_remote_commitment_number.write(w)?;
+ if let Some(ref data_loss_protect) = self.data_loss_protect {
+ data_loss_protect.your_last_per_commitment_secret.write(w)?;
+ data_loss_protect.my_current_per_commitment_point.write(w)?;
+ }
+ Ok(())
+ }
+}
+
+impl<R: ::std::io::Read> Readable<R> for ChannelReestablish{
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ Ok(Self {
+ channel_id: Readable::read(r)?,
+ next_local_commitment_number: Readable::read(r)?,
+ next_remote_commitment_number: Readable::read(r)?,
+ data_loss_protect: {
+ match <[u8; 32] as Readable<R>>::read(r) {
+ Ok(your_last_per_commitment_secret) =>
+ Some(DataLossProtect {
+ your_last_per_commitment_secret,
+ my_current_per_commitment_point: Readable::read(r)?,
+ }),
+ Err(DecodeError::ShortRead) => None,
+ Err(e) => return Err(e)
+ }
+ }
+ })
+ }
+}
+
+impl_writeable!(ClosingSigned, {
+ channel_id,
+ fee_satoshis,
+ signature
+});
+
+impl_writeable!(CommitmentSigned, {
+ channel_id,
+ signature,
+ htlc_signatures
+});
+
+impl_writeable!(DecodedOnionErrorPacket, {
+ hmac,
+ failuremsg,
+ pad
+});
+
+impl_writeable!(FundingCreated, {
+ temporary_channel_id,
+ funding_txid,
+ funding_output_index,
+ signature
+});
+
+impl_writeable!(FundingSigned, {
+ channel_id,
+ signature
+});
+
+impl_writeable!(FundingLocked, {
+ channel_id,
+ next_per_commitment_point
+});
+
+impl_writeable!(GlobalFeatures, {
+ flags
+});
+
+impl_writeable!(LocalFeatures, {
+ flags
+});
+
+impl_writeable!(Init, {
+ global_features,
+ local_features
+});
+
+impl_writeable!(OpenChannel, {
+ chain_hash,
+ temporary_channel_id,
+ funding_satoshis,
+ push_msat,
+ dust_limit_satoshis,
+ max_htlc_value_in_flight_msat,
+ channel_reserve_satoshis,
+ htlc_minimum_msat,
+ feerate_per_kw,
+ to_self_delay,
+ max_accepted_htlcs,
+ funding_pubkey,
+ revocation_basepoint,
+ payment_basepoint,
+ delayed_payment_basepoint,
+ htlc_basepoint,
+ first_per_commitment_point,
+ channel_flags,
+ shutdown_scriptpubkey
+});
+
+impl_writeable!(RevokeAndACK, {
+ channel_id,
+ per_commitment_secret,
+ next_per_commitment_point
+});
+
+impl_writeable!(Shutdown, {
+ channel_id,
+ scriptpubkey
+});
+
+impl_writeable!(UpdateFailHTLC, {
+ channel_id,
+ htlc_id,
+ reason
+});
+
+impl_writeable!(UpdateFailMalformedHTLC, {
+ channel_id,
+ htlc_id,
+ sha256_of_onion,
+ failure_code
+});
+
+impl_writeable!(UpdateFee, {
+ channel_id,
+ feerate_per_kw
+});
+
+impl_writeable!(UpdateFulfillHTLC, {
+ channel_id,
+ htlc_id,
+ payment_preimage
+});
+
+impl_writeable!(OnionErrorPacket, {
+ data
+});
+
+impl<W: ::std::io::Write> Writeable<W> for OnionPacket {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.version.write(w)?;
+ match self.public_key {
+ Ok(pubkey) => pubkey.write(w)?,
+ Err(_) => [0u8;33].write(w)?,
+ }
+ w.write_all(&self.hop_data)?;
+ self.hmac.write(w)?;
+ Ok(())
+ }
+}
+
+impl<R: ::std::io::Read> Readable<R> for OnionPacket {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ Ok(OnionPacket {
+ version: Readable::read(r)?,
+ public_key: {
+ let mut buf = [0u8;33];
+ r.read_exact(&mut buf)?;
+ PublicKey::from_slice(&Secp256k1::without_caps(), &buf)
+ },
+ hop_data: Readable::read(r)?,
+ hmac: Readable::read(r)?,
+ })
+ }
+}
+
+impl_writeable!(UpdateAddHTLC, {
+ channel_id,
+ htlc_id,
+ amount_msat,
+ payment_hash,
+ cltv_expiry,
+ onion_routing_packet
+});
+
+impl<W: ::std::io::Write> Writeable<W> for OnionRealm0HopData {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.short_channel_id.write(w)?;
+ self.amt_to_forward.write(w)?;
+ self.outgoing_cltv_value.write(w)?;
+ w.write_all(&[0;12])?;
+ Ok(())
+ }
+}
+
+impl<R: ::std::io::Read> Readable<R> for OnionRealm0HopData {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ Ok(OnionRealm0HopData {
+ short_channel_id: Readable::read(r)?,
+ amt_to_forward: Readable::read(r)?,
+ outgoing_cltv_value: {
+ let v: u32 = Readable::read(r)?;
+ r.read_exact(&mut [0; 12])?;
+ v
+ }
+ })
+ }
+}
+
+impl<W: ::std::io::Write> Writeable<W> for OnionHopData {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.realm.write(w)?;
+ self.data.write(w)?;
+ self.hmac.write(w)?;
+ Ok(())
+ }
+}
+
+impl<R: ::std::io::Read> Readable<R> for OnionHopData {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ Ok(OnionHopData {
+ realm: {
+ let r: u8 = Readable::read(r)?;
+ if r != 0 {
+ return Err(DecodeError::UnknownRealmByte);
+ }
+ r
+ },
+ data: Readable::read(r)?,
+ hmac: Readable::read(r)?,
+ })
+ }
+}
+
+impl<W: ::std::io::Write> Writeable<W> for Ping {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.ponglen.write(w)?;
+ vec![0u8; self.byteslen as usize].write(w)?; // size-unchecked write
+ Ok(())
+ }
+}
+
+impl<R: ::std::io::Read> Readable<R> for Ping {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ Ok(Ping {
+ ponglen: Readable::read(r)?,
+ byteslen: {
+ let byteslen = Readable::read(r)?;
+ r.read_exact(&mut vec![0u8; byteslen as usize][..])?;
+ byteslen
+ }
+ })
+ }
+}
+
+impl<W: ::std::io::Write> Writeable<W> for Pong {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ vec![0u8; self.byteslen as usize].write(w)?; // size-unchecked write
+ Ok(())
+ }
+}
+
+impl<R: ::std::io::Read> Readable<R> for Pong {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ Ok(Pong {
+ byteslen: {
+ let byteslen = Readable::read(r)?;
+ r.read_exact(&mut vec![0u8; byteslen as usize][..])?;
+ byteslen
+ }
+ })
+ }
+}
+
+impl<W: ::std::io::Write> Writeable<W> for UnsignedChannelAnnouncement {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.features.write(w)?;
+ self.chain_hash.write(w)?;
+ self.short_channel_id.write(w)?;
+ self.node_id_1.write(w)?;
+ self.node_id_2.write(w)?;
+ self.bitcoin_key_1.write(w)?;
+ self.bitcoin_key_2.write(w)?;
+ w.write_all(&self.excess_data[..])?;
+ Ok(())
+ }
+}
+
+impl<R: ::std::io::Read> Readable<R> for UnsignedChannelAnnouncement {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ Ok(Self {
+ features: {
+ let f: GlobalFeatures = Readable::read(r)?;
+ if f.requires_unknown_bits() {
+ return Err(DecodeError::UnknownRequiredFeature);
+ }
+ f
+ },
+ chain_hash: Readable::read(r)?,
+ short_channel_id: Readable::read(r)?,
+ node_id_1: Readable::read(r)?,
+ node_id_2: Readable::read(r)?,
+ bitcoin_key_1: Readable::read(r)?,
+ bitcoin_key_2: Readable::read(r)?,
+ excess_data: {
+ let mut excess_data = vec![];
+ r.read_to_end(&mut excess_data)?;
+ excess_data
+ },
+ })
+ }
+}
+
+impl_writeable!(ChannelAnnouncement,{
+ node_signature_1,
+ node_signature_2,
+ bitcoin_signature_1,
+ bitcoin_signature_2,
+ contents
+});
+
+impl<W: ::std::io::Write> Writeable<W> for UnsignedChannelUpdate {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.chain_hash.write(w)?;
+ self.short_channel_id.write(w)?;
+ self.timestamp.write(w)?;
+ self.flags.write(w)?;
+ self.cltv_expiry_delta.write(w)?;
+ self.htlc_minimum_msat.write(w)?;
+ self.fee_base_msat.write(w)?;
+ self.fee_proportional_millionths.write(w)?;
+ w.write_all(&self.excess_data[..])?;
+ Ok(())
+ }
+}
+
+impl<R: ::std::io::Read> Readable<R> for UnsignedChannelUpdate {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ Ok(Self {
+ chain_hash: Readable::read(r)?,
+ short_channel_id: Readable::read(r)?,
+ timestamp: Readable::read(r)?,
+ flags: Readable::read(r)?,
+ cltv_expiry_delta: Readable::read(r)?,
+ htlc_minimum_msat: Readable::read(r)?,
+ fee_base_msat: Readable::read(r)?,
+ fee_proportional_millionths: Readable::read(r)?,
+ excess_data: {
+ let mut excess_data = vec![];
+ r.read_to_end(&mut excess_data)?;
+ excess_data
+ },
+ })
+ }
+}
+
+impl_writeable!(ChannelUpdate, {
+ signature,
+ contents
+});
+
+impl<W: ::std::io::Write> Writeable<W> for ErrorMessage {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.channel_id.write(w)?;
+ self.data.as_bytes().to_vec().write(w)?; // write with size prefix
+ Ok(())
+ }
+}
+
+impl<R: ::std::io::Read> Readable<R> for ErrorMessage {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ Ok(Self {
+ channel_id: Readable::read(r)?,
+ data: {
+ let mut sz: usize = <u16 as Readable<R>>::read(r)? as usize;
+ let mut data = vec![];
+ let data_len = r.read_to_end(&mut data)?;
+ sz = cmp::min(data_len, sz);
+ match String::from_utf8(data[..sz as usize].to_vec()) {
+ Ok(s) => s,
+ Err(_) => return Err(DecodeError::BadText),
+ }
+ }
+ })
+ }
+}
+
+impl<W: ::std::io::Write> Writeable<W> for UnsignedNodeAnnouncement {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.features.write(w)?;
+ self.timestamp.write(w)?;
+ self.node_id.write(w)?;
+ w.write_all(&self.rgb)?;
+ self.alias.write(w)?;
+
+ let mut addr_slice = Vec::with_capacity(self.addresses.len() * 18);
+ let mut addrs_to_encode = self.addresses.clone();
+ addrs_to_encode.sort_unstable_by(|a, b| { a.get_id().cmp(&b.get_id()) });
+ addrs_to_encode.dedup_by(|a, b| { a.get_id() == b.get_id() });
+ for addr in addrs_to_encode.iter() {
+ match addr {
+ &NetAddress::IPv4{addr, port} => {
+ addr_slice.push(1);
+ addr_slice.extend_from_slice(&addr);
+ addr_slice.extend_from_slice(&byte_utils::be16_to_array(port));
+ },
+ &NetAddress::IPv6{addr, port} => {
+ addr_slice.push(2);
+ addr_slice.extend_from_slice(&addr);
+ addr_slice.extend_from_slice(&byte_utils::be16_to_array(port));
+ },
+ &NetAddress::OnionV2{addr, port} => {
+ addr_slice.push(3);
+ addr_slice.extend_from_slice(&addr);
+ addr_slice.extend_from_slice(&byte_utils::be16_to_array(port));
+ },
+ &NetAddress::OnionV3{ed25519_pubkey, checksum, version, port} => {
+ addr_slice.push(4);
+ addr_slice.extend_from_slice(&ed25519_pubkey);
+ addr_slice.extend_from_slice(&byte_utils::be16_to_array(checksum));
+ addr_slice.push(version);
+ addr_slice.extend_from_slice(&byte_utils::be16_to_array(port));
+ },
+ }
+ }
+ ((addr_slice.len() + self.excess_address_data.len()) as u16).write(w)?;
+ w.write_all(&addr_slice[..])?;
+ w.write_all(&self.excess_address_data[..])?;
+ w.write_all(&self.excess_data[..])?;
+ Ok(())
+ }
+}
+
+impl<R: ::std::io::Read> Readable<R> for UnsignedNodeAnnouncement {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ let features: GlobalFeatures = Readable::read(r)?;
+ if features.requires_unknown_bits() {
+ return Err(DecodeError::UnknownRequiredFeature);
+ }
+ let timestamp: u32 = Readable::read(r)?;
+ let node_id: PublicKey = Readable::read(r)?;
+ let mut rgb = [0; 3];
+ r.read_exact(&mut rgb)?;
+ let alias: [u8; 32] = Readable::read(r)?;
+
+ let addrlen: u16 = Readable::read(r)?;
+ let mut addr_readpos = 0;
+ let mut addresses = Vec::with_capacity(4);
+ let mut f: u8 = 0;
+ let mut excess = 0;
+ loop {
+ if addrlen <= addr_readpos { break; }
+ f = Readable::read(r)?;
+ match f {
+ 1 => {
+ if addresses.len() > 0 {
+ return Err(DecodeError::ExtraAddressesPerType);
+ }
+ if addrlen < addr_readpos + 1 + 6 {
+ return Err(DecodeError::BadLengthDescriptor);
+ }
+ addresses.push(NetAddress::IPv4 {
+ addr: {
+ let mut addr = [0; 4];
+ r.read_exact(&mut addr)?;
+ addr
+ },
+ port: Readable::read(r)?,
+ });
+ addr_readpos += 1 + 6
+ },
+ 2 => {
+ if addresses.len() > 1 || (addresses.len() == 1 && addresses[0].get_id() != 1) {
+ return Err(DecodeError::ExtraAddressesPerType);
+ }
+ if addrlen < addr_readpos + 1 + 18 {
+ return Err(DecodeError::BadLengthDescriptor);
+ }
+ addresses.push(NetAddress::IPv6 {
+ addr: {
+ let mut addr = [0; 16];
+ r.read_exact(&mut addr)?;
+ addr
+ },
+ port: Readable::read(r)?,
+ });
+ addr_readpos += 1 + 18
+ },
+ 3 => {
+ if addresses.len() > 2 || (addresses.len() > 0 && addresses.last().unwrap().get_id() > 2) {
+ return Err(DecodeError::ExtraAddressesPerType);
+ }
+ if addrlen < addr_readpos + 1 + 12 {
+ return Err(DecodeError::BadLengthDescriptor);
+ }
+ addresses.push(NetAddress::OnionV2 {
+ addr: {
+ let mut addr = [0; 10];
+ r.read_exact(&mut addr)?;
+ addr
+ },
+ port: Readable::read(r)?,
+ });
+ addr_readpos += 1 + 12
+ },
+ 4 => {
+ if addresses.len() > 3 || (addresses.len() > 0 && addresses.last().unwrap().get_id() > 3) {
+ return Err(DecodeError::ExtraAddressesPerType);
+ }
+ if addrlen < addr_readpos + 1 + 37 {
+ return Err(DecodeError::BadLengthDescriptor);
+ }
+ addresses.push(NetAddress::OnionV3 {
+ ed25519_pubkey: Readable::read(r)?,
+ checksum: Readable::read(r)?,
+ version: Readable::read(r)?,
+ port: Readable::read(r)?,
+ });
+ addr_readpos += 1 + 37
+ },
+ _ => { excess = 1; break; }
+ }
+ }
+
+ let mut excess_data = vec![];
+ let excess_address_data = if addr_readpos < addrlen {
+ let mut excess_address_data = vec![0; (addrlen - addr_readpos) as usize];
+ r.read_exact(&mut excess_address_data[excess..])?;
+ if excess == 1 {
+ excess_address_data[0] = f;
+ }
+ excess_address_data
+ } else {
+ if excess == 1 {
+ excess_data.push(f);
+ }
+ Vec::new()
+ };
+
+ Ok(UnsignedNodeAnnouncement {
+ features: features,
+ timestamp: timestamp,
+ node_id: node_id,
+ rgb: rgb,
+ alias: alias,
+ addresses: addresses,
+ excess_address_data: excess_address_data,
+ excess_data: {
+ r.read_to_end(&mut excess_data)?;
+ excess_data
+ },
+ })
+ }
+}
+
+impl_writeable!(NodeAnnouncement, {
+ signature,
+ contents
+});
+
#[cfg(test)]
mod tests {
use hex;
use secp256k1::key::{SecretKey,PublicKey};
use ln::msgs;
-use ln::msgs::{MsgEncodable,MsgDecodable};
+use util::ser::{Writer, Reader, Writeable, Readable};
use ln::peer_channel_encryptor::{PeerChannelEncryptor,NextNoiseStep};
use util::byte_utils;
use util::events::{EventsProvider,Event};
}
macro_rules! encode_msg {
- ($msg: expr, $msg_code: expr) => {
- {
- let just_msg = $msg.encode();
- let mut encoded_msg = Vec::with_capacity(just_msg.len() + 2);
- encoded_msg.extend_from_slice(&byte_utils::be16_to_array($msg_code));
- encoded_msg.extend_from_slice(&just_msg[..]);
- encoded_msg
- }
- }
+ ($msg: expr, $msg_code: expr) => {{
+ let mut w = Writer::new(::std::io::Cursor::new(vec![]));
+ 0u16.write(&mut w).unwrap();
+ $msg.write(&mut w).unwrap();
+ let mut msg = w.into_inner().into_inner();
+ let len = msg.len();
+ msg[..2].copy_from_slice(&byte_utils::be16_to_array(len as u16 - 2));
+ msg
+ }}
}
//TODO: Really should do something smarter for this
continue;
},
msgs::DecodeError::BadLengthDescriptor => return Err(PeerHandleError{ no_connection_possible: false }),
+ msgs::DecodeError::Io(_) => return Err(PeerHandleError{ no_connection_possible: false }),
+ msgs::DecodeError::InvalidValue => panic!("should not happen with message decoding"),
}
}
};
// Need an init message as first message
return Err(PeerHandleError{ no_connection_possible: false });
}
+ let mut reader = Reader::new(::std::io::Cursor::new(&msg_data[2..]));
match msg_type {
// Connection control:
16 => {
- let msg = try_potential_decodeerror!(msgs::Init::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::Init::read(&mut reader));
if msg.global_features.requires_unknown_bits() {
return Err(PeerHandleError{ no_connection_possible: true });
}
}
},
17 => {
- let msg = try_potential_decodeerror!(msgs::ErrorMessage::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::ErrorMessage::read(&mut reader));
let mut data_is_printable = true;
for b in msg.data.bytes() {
if b < 32 || b > 126 {
},
18 => {
- let msg = try_potential_decodeerror!(msgs::Ping::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::Ping::read(&mut reader));
if msg.ponglen < 65532 {
let resp = msgs::Pong { byteslen: msg.ponglen };
encode_and_send_msg!(resp, 19);
}
},
19 => {
- try_potential_decodeerror!(msgs::Pong::decode(&msg_data[2..]));
+ try_potential_decodeerror!(msgs::Pong::read(&mut reader));
},
// Channel control:
32 => {
- let msg = try_potential_decodeerror!(msgs::OpenChannel::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::OpenChannel::read(&mut reader));
let resp = try_potential_handleerror!(self.message_handler.chan_handler.handle_open_channel(&peer.their_node_id.unwrap(), &msg));
encode_and_send_msg!(resp, 33);
},
33 => {
- let msg = try_potential_decodeerror!(msgs::AcceptChannel::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::AcceptChannel::read(&mut reader));
try_potential_handleerror!(self.message_handler.chan_handler.handle_accept_channel(&peer.their_node_id.unwrap(), &msg));
},
34 => {
- let msg = try_potential_decodeerror!(msgs::FundingCreated::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::FundingCreated::read(&mut reader));
let resp = try_potential_handleerror!(self.message_handler.chan_handler.handle_funding_created(&peer.their_node_id.unwrap(), &msg));
encode_and_send_msg!(resp, 35);
},
35 => {
- let msg = try_potential_decodeerror!(msgs::FundingSigned::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::FundingSigned::read(&mut reader));
try_potential_handleerror!(self.message_handler.chan_handler.handle_funding_signed(&peer.their_node_id.unwrap(), &msg));
},
36 => {
- let msg = try_potential_decodeerror!(msgs::FundingLocked::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::FundingLocked::read(&mut reader));
let resp_option = try_potential_handleerror!(self.message_handler.chan_handler.handle_funding_locked(&peer.their_node_id.unwrap(), &msg));
match resp_option {
Some(resp) => encode_and_send_msg!(resp, 259),
},
38 => {
- let msg = try_potential_decodeerror!(msgs::Shutdown::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::Shutdown::read(&mut reader));
let resp_options = try_potential_handleerror!(self.message_handler.chan_handler.handle_shutdown(&peer.their_node_id.unwrap(), &msg));
if let Some(resp) = resp_options.0 {
encode_and_send_msg!(resp, 38);
}
},
39 => {
- let msg = try_potential_decodeerror!(msgs::ClosingSigned::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::ClosingSigned::read(&mut reader));
let resp_option = try_potential_handleerror!(self.message_handler.chan_handler.handle_closing_signed(&peer.their_node_id.unwrap(), &msg));
if let Some(resp) = resp_option {
encode_and_send_msg!(resp, 39);
},
128 => {
- let msg = try_potential_decodeerror!(msgs::UpdateAddHTLC::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::UpdateAddHTLC::read(&mut reader));
try_potential_handleerror!(self.message_handler.chan_handler.handle_update_add_htlc(&peer.their_node_id.unwrap(), &msg));
},
130 => {
- let msg = try_potential_decodeerror!(msgs::UpdateFulfillHTLC::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::UpdateFulfillHTLC::read(&mut reader));
try_potential_handleerror!(self.message_handler.chan_handler.handle_update_fulfill_htlc(&peer.their_node_id.unwrap(), &msg));
},
131 => {
- let msg = try_potential_decodeerror!(msgs::UpdateFailHTLC::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::UpdateFailHTLC::read(&mut reader));
let chan_update = try_potential_handleerror!(self.message_handler.chan_handler.handle_update_fail_htlc(&peer.their_node_id.unwrap(), &msg));
if let Some(update) = chan_update {
self.message_handler.route_handler.handle_htlc_fail_channel_update(&update);
}
},
135 => {
- let msg = try_potential_decodeerror!(msgs::UpdateFailMalformedHTLC::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::UpdateFailMalformedHTLC::read(&mut reader));
try_potential_handleerror!(self.message_handler.chan_handler.handle_update_fail_malformed_htlc(&peer.their_node_id.unwrap(), &msg));
},
132 => {
- let msg = try_potential_decodeerror!(msgs::CommitmentSigned::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::CommitmentSigned::read(&mut reader));
let resps = try_potential_handleerror!(self.message_handler.chan_handler.handle_commitment_signed(&peer.their_node_id.unwrap(), &msg));
encode_and_send_msg!(resps.0, 133);
if let Some(resp) = resps.1 {
}
},
133 => {
- let msg = try_potential_decodeerror!(msgs::RevokeAndACK::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::RevokeAndACK::read(&mut reader));
let resp_option = try_potential_handleerror!(self.message_handler.chan_handler.handle_revoke_and_ack(&peer.their_node_id.unwrap(), &msg));
match resp_option {
Some(resps) => {
}
},
134 => {
- let msg = try_potential_decodeerror!(msgs::UpdateFee::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::UpdateFee::read(&mut reader));
try_potential_handleerror!(self.message_handler.chan_handler.handle_update_fee(&peer.their_node_id.unwrap(), &msg));
},
136 => { }, // TODO: channel_reestablish
// Routing control:
259 => {
- let msg = try_potential_decodeerror!(msgs::AnnouncementSignatures::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::AnnouncementSignatures::read(&mut reader));
try_potential_handleerror!(self.message_handler.chan_handler.handle_announcement_signatures(&peer.their_node_id.unwrap(), &msg));
},
256 => {
- let msg = try_potential_decodeerror!(msgs::ChannelAnnouncement::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::ChannelAnnouncement::read(&mut reader));
let should_forward = try_potential_handleerror!(self.message_handler.route_handler.handle_channel_announcement(&msg));
if should_forward {
}
},
257 => {
- let msg = try_potential_decodeerror!(msgs::NodeAnnouncement::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::NodeAnnouncement::read(&mut reader));
let should_forward = try_potential_handleerror!(self.message_handler.route_handler.handle_node_announcement(&msg));
if should_forward {
}
},
258 => {
- let msg = try_potential_decodeerror!(msgs::ChannelUpdate::decode(&msg_data[2..]));
+ let msg = try_potential_decodeerror!(msgs::ChannelUpdate::read(&mut reader));
let should_forward = try_potential_handleerror!(self.message_handler.route_handler.handle_channel_update(&msg));
if should_forward {
#[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;
--- /dev/null
+use std::result::Result;
+use std::io::{Read, Write};
+use std::collections::HashMap;
+use std::hash::Hash;
+use std::mem;
+
+use secp256k1::{Secp256k1, Signature};
+use secp256k1::key::PublicKey;
+use bitcoin::util::hash::Sha256dHash;
+use bitcoin::blockdata::script::Script;
+use std::marker::Sized;
+use ln::msgs::DecodeError;
+
+use util::byte_utils::{be64_to_array, be32_to_array, be16_to_array, slice_to_be16, slice_to_be32, slice_to_be64};
+
+const MAX_BUF_SIZE: usize = 16 * 1024;
+
+pub struct Writer<W> { writer: W }
+pub struct Reader<R> { reader: R }
+
+pub trait Writeable<W: Write> {
+ fn write(&self, writer: &mut Writer<W>) -> Result<(), DecodeError>;
+}
+
+pub trait Readable<R>
+ where Self: Sized,
+ R: Read
+{
+ fn read(reader: &mut Reader<R>) -> Result<Self, DecodeError>;
+}
+
+impl<W: Write> Writer<W> {
+ pub fn new(writer: W) -> Writer<W> {
+ return Writer { writer }
+ }
+ pub fn into_inner(self) -> W { self.writer }
+ pub fn get_ref(&self) -> &W { &self.writer }
+ fn write_u64(&mut self, v: u64) -> Result<(), DecodeError> {
+ Ok(self.writer.write_all(&be64_to_array(v))?)
+ }
+ fn write_u32(&mut self, v: u32) -> Result<(), DecodeError> {
+ Ok(self.writer.write_all(&be32_to_array(v))?)
+ }
+ fn write_u16(&mut self, v: u16) -> Result<(), DecodeError> {
+ Ok(self.writer.write_all(&be16_to_array(v))?)
+ }
+ fn write_u8(&mut self, v: u8) -> Result<(), DecodeError> {
+ Ok(self.writer.write_all(&[v])?)
+ }
+ fn write_bool(&mut self, v: bool) -> Result<(), DecodeError> {
+ Ok(self.writer.write_all(&[if v {1} else {0}])?)
+ }
+ pub fn write_all(&mut self, v: &[u8]) -> Result<(), DecodeError> {
+ Ok(self.writer.write_all(v)?)
+ }
+}
+
+impl<R: Read> Reader<R> {
+ pub fn new(reader: R) -> Reader<R> {
+ return Reader { reader }
+ }
+ pub fn into_inner(self) -> R { self.reader }
+ pub fn get_ref(&self) -> &R { &self.reader }
+
+ fn read_u64(&mut self) -> Result<u64, DecodeError> {
+ let mut buf = [0; 8];
+ self.reader.read_exact(&mut buf)?;
+ Ok(slice_to_be64(&buf))
+ }
+
+ fn read_u32(&mut self) -> Result<u32, DecodeError> {
+ let mut buf = [0; 4];
+ self.reader.read_exact(&mut buf)?;
+ Ok(slice_to_be32(&buf))
+ }
+
+ fn read_u16(&mut self) -> Result<u16, DecodeError> {
+ let mut buf = [0; 2];
+ self.reader.read_exact(&mut buf)?;
+ Ok(slice_to_be16(&buf))
+ }
+
+ fn read_u8(&mut self) -> Result<u8, DecodeError> {
+ let mut buf = [0; 1];
+ self.reader.read_exact(&mut buf)?;
+ Ok(buf[0])
+ }
+ fn read_bool(&mut self) -> Result<bool, DecodeError> {
+ let mut buf = [0; 1];
+ self.reader.read_exact(&mut buf)?;
+ if buf[0] != 0 && buf[0] != 1 {
+ return Err(DecodeError::InvalidValue);
+ }
+ Ok(buf[0] == 1)
+ }
+ pub fn read_exact(&mut self, buf: &mut [u8]) -> Result<(), DecodeError> {
+ Ok(self.reader.read_exact(buf)?)
+ }
+ pub fn read_to_end(&mut self, buf: &mut Vec<u8>) -> Result<usize, DecodeError> {
+ Ok(self.reader.read_to_end(buf)?)
+ }
+}
+
+macro_rules! impl_writeable_primitive {
+ ($val_type:ty, $meth_write:ident, $meth_read:ident) => {
+ impl<W:Write> Writeable<W> for $val_type {
+ #[inline]
+ fn write(&self, writer: &mut Writer<W>) -> Result<(), DecodeError> {
+ writer.$meth_write(*self)
+ }
+ }
+ impl<R:Read> Readable<R> for $val_type {
+ #[inline]
+ fn read(reader: &mut Reader<R>) -> Result<$val_type, DecodeError> {
+ reader.$meth_read()
+ }
+ }
+ }
+}
+
+impl_writeable_primitive!(u64, write_u64, read_u64);
+impl_writeable_primitive!(u32, write_u32, read_u32);
+impl_writeable_primitive!(u16, write_u16, read_u16);
+impl_writeable_primitive!(u8, write_u8, read_u8);
+impl_writeable_primitive!(bool, write_bool, read_bool);
+
+// u8 arrays
+macro_rules! impl_array {
+ ( $size:expr ) => (
+ impl<W> Writeable<W> for [u8; $size]
+ where W: Write
+ {
+ #[inline]
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ w.write_all(self)?;
+ Ok(())
+ }
+ }
+
+ impl<R> Readable<R> for [u8; $size]
+ where R: Read
+ {
+ #[inline]
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ let mut buf = [0u8; $size];
+ r.read_exact(&mut buf)?;
+ Ok(buf)
+ }
+ }
+ );
+}
+
+//TODO: performance issue with [u8; size] with impl_array!()
+impl_array!(32); // for channel id & hmac
+impl_array!(33); // for PublicKey
+impl_array!(64); // for Signature
+impl_array!(1300); // for OnionPacket.hop_data
+
+// HashMap
+impl<W, K, V> Writeable<W> for HashMap<K, V>
+ where W: Write,
+ K: Writeable<W> + Eq + Hash,
+ V: Writeable<W>
+{
+ #[inline]
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ (self.len() as u16).write(w)?;
+ for (key, value) in self.iter() {
+ key.write(w)?;
+ value.write(w)?;
+ }
+ Ok(())
+ }
+}
+
+impl<R, K, V> Readable<R> for HashMap<K, V>
+ where R: Read,
+ K: Readable<R> + Eq + Hash,
+ V: Readable<R>
+{
+ #[inline]
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ let len: u16 = Readable::read(r)?;
+ let mut ret = HashMap::with_capacity(len as usize);
+ for _ in 0..len {
+ ret.insert(K::read(r)?, V::read(r)?);
+ }
+ Ok(ret)
+ }
+}
+
+// Vectors
+impl<W: Write, T: Writeable<W>> Writeable<W> for Vec<T> {
+ #[inline]
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ let byte_size = (self.len() as usize)
+ .checked_mul(mem::size_of::<T>())
+ .ok_or(DecodeError::BadLengthDescriptor)?;
+ if byte_size > MAX_BUF_SIZE {
+ return Err(DecodeError::BadLengthDescriptor);
+ }
+ (self.len() as u16).write(w)?;
+ // performance with Vec<u8>
+ for e in self.iter() {
+ e.write(w)?;
+ }
+ Ok(())
+ }
+}
+
+impl<R: Read, T: Readable<R>> Readable<R> for Vec<T> {
+ #[inline]
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ let len: u16 = Readable::read(r)?;
+ let byte_size = (len as usize)
+ .checked_mul(mem::size_of::<T>())
+ .ok_or(DecodeError::BadLengthDescriptor)?;
+ if byte_size > MAX_BUF_SIZE {
+ return Err(DecodeError::BadLengthDescriptor);
+ }
+ let mut ret = Vec::with_capacity(len as usize);
+ for _ in 0..len { ret.push(T::read(r)?); }
+ Ok(ret)
+ }
+}
+
+impl<W: Write> Writeable<W> for Script {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.to_bytes().to_vec().write(w)
+ }
+}
+
+impl<R: Read> Readable<R> for Script {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ let len = <u16 as Readable<R>>::read(r)? as usize;
+ let mut buf = vec![0; len];
+ r.read_exact(&mut buf)?;
+ Ok(Script::from(buf))
+ }
+}
+
+impl<W: Write> Writeable<W> for Option<Script> {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ if let &Some(ref script) = self {
+ script.write(w)?;
+ }
+ Ok(())
+ }
+}
+
+impl<R: Read> Readable<R> for Option<Script> {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ match <u16 as Readable<R>>::read(r) {
+ Ok(len) => {
+ let mut buf = vec![0; len as usize];
+ r.read_exact(&mut buf)?;
+ Ok(Some(Script::from(buf)))
+ },
+ Err(DecodeError::ShortRead) => Ok(None),
+ Err(e) => Err(e)
+ }
+ }
+}
+
+impl<W: Write> Writeable<W> for PublicKey {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.serialize().write(w)
+ }
+}
+
+impl<R: Read> Readable<R> for PublicKey {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ let buf: [u8; 33] = Readable::read(r)?;
+ match PublicKey::from_slice(&Secp256k1::without_caps(), &buf) {
+ Ok(key) => Ok(key),
+ Err(_) => return Err(DecodeError::BadPublicKey),
+ }
+ }
+}
+
+impl<W: Write> Writeable<W> for Sha256dHash {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.as_bytes().write(w)
+ }
+}
+
+impl<R: Read> Readable<R> for Sha256dHash {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ let buf: [u8; 32] = Readable::read(r)?;
+ Ok(From::from(&buf[..]))
+ }
+}
+
+impl<W: Write> Writeable<W> for Signature {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ self.serialize_compact(&Secp256k1::without_caps()).write(w)
+ }
+}
+
+impl<R: Read> Readable<R> for Signature {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ let buf: [u8; 64] = Readable::read(r)?;
+ match Signature::from_compact(&Secp256k1::without_caps(), &buf) {
+ Ok(sig) => Ok(sig),
+ Err(_) => return Err(DecodeError::BadSignature),
+ }
+ }
+}
+
+macro_rules! impl_writeable {
+ ($st:ident, {$($field:ident),*}) => {
+ impl<W: ::std::io::Write> Writeable<W> for $st {
+ fn write(&self, w: &mut Writer<W>) -> Result<(), DecodeError> {
+ $( self.$field.write(w)?; )*
+ Ok(())
+ }
+ }
+
+ impl<R: ::std::io::Read> Readable<R> for $st {
+ fn read(r: &mut Reader<R>) -> Result<Self, DecodeError> {
+ Ok(Self {
+ $($field: Readable::read(r)?),*
+ })
+ }
+ }
+ }
+}
projects / rust-lightning / commitdiff