X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fmsgs.rs;h=42ee9d63e345e85ab3b44060c721fe645b055224;hb=335012640a809821cd5a0afd35cb1e7463e1002d;hp=00095cd15ab2ea2badc9941e7b7f84453b9b0be5;hpb=0881bf4b7460921eff425f0b4833b994922064a5;p=rust-lightning

diff --git a/src/ln/msgs.rs b/src/ln/msgs.rs
index 00095cd1..42ee9d63 100644
--- a/src/ln/msgs.rs
+++ b/src/ln/msgs.rs
@@ -337,6 +337,8 @@ pub struct UnsignedNodeAnnouncement {
 	/// List of addresses on which this node is reachable. Note that you may only have up to one
 	/// address of each type, if you have more, they may be silently discarded or we may panic!
 	pub addresses: Vec<NetAddress>,
+	pub excess_address_data: Vec<u8>,
+	pub excess_data: Vec<u8>,
 }
 pub struct NodeAnnouncement {
 	pub signature: Signature,
@@ -373,6 +375,7 @@ pub struct UnsignedChannelUpdate {
 	pub htlc_minimum_msat: u64,
 	pub fee_base_msat: u32,
 	pub fee_proportional_millionths: u32,
+	pub excess_data: Vec<u8>,
 }
 #[derive(PartialEq, Clone)]
 pub struct ChannelUpdate {
@@ -1216,7 +1219,6 @@ impl MsgDecodable for UnsignedNodeAnnouncement {
 		loop {
 			if addr_read_limit <= read_pos { break; }
 			match v[read_pos] {
-				0 => { read_pos += 1; },
 				1 => {
 					if addresses.len() > 0 {
 						return Err(DecodeError::ExtraAddressesPerType);
@@ -1283,6 +1285,15 @@ impl MsgDecodable for UnsignedNodeAnnouncement {
 			}
 		}
 
+		let excess_address_data = if read_pos < addr_read_limit {
+			let mut excess_address_data = Vec::with_capacity(addr_read_limit - read_pos);
+			excess_address_data.extend_from_slice(&v[read_pos..addr_read_limit]);
+			excess_address_data
+		} else { Vec::new() };
+
+		let mut excess_data = Vec::with_capacity(v.len() - addr_read_limit);
+		excess_data.extend_from_slice(&v[addr_read_limit..]);
+
 		let secp_ctx = Secp256k1::without_caps();
 		Ok(Self {
 			features,
@@ -1291,13 +1302,15 @@ impl MsgDecodable for UnsignedNodeAnnouncement {
 			rgb,
 			alias,
 			addresses,
+			excess_address_data,
+			excess_data,
 		})
 	}
 }
 impl MsgEncodable for UnsignedNodeAnnouncement {
 	fn encode(&self) -> Vec<u8> {
 		let features = self.features.encode();
-		let mut res = Vec::with_capacity(74 + features.len() + self.addresses.len());
+		let mut res = Vec::with_capacity(74 + features.len() + self.addresses.len()*7 + self.excess_address_data.len() + self.excess_data.len());
 		res.extend_from_slice(&features[..]);
 		res.extend_from_slice(&byte_utils::be32_to_array(self.timestamp));
 		res.extend_from_slice(&self.node_id.serialize());
@@ -1333,8 +1346,10 @@ impl MsgEncodable for UnsignedNodeAnnouncement {
 				},
 			}
 		}
-		res.extend_from_slice(&byte_utils::be16_to_array(addr_slice.len() as u16));
+		res.extend_from_slice(&byte_utils::be16_to_array((addr_slice.len() + self.excess_address_data.len()) as u16));
 		res.extend_from_slice(&addr_slice[..]);
+		res.extend_from_slice(&self.excess_address_data[..]);
+		res.extend_from_slice(&self.excess_data[..]);
 		res
 	}
 }
@@ -1434,6 +1449,8 @@ impl MsgDecodable for UnsignedChannelUpdate {
 		if v.len() < 32+8+4+2+2+8+4+4 {
 			return Err(DecodeError::ShortRead);
 		}
+		let mut excess_data = Vec::with_capacity(v.len() - 64);
+		excess_data.extend_from_slice(&v[64..]);
 		Ok(Self {
 			chain_hash: deserialize(&v[0..32]).unwrap(),
 			short_channel_id: byte_utils::slice_to_be64(&v[32..40]),
@@ -1443,12 +1460,13 @@ impl MsgDecodable for UnsignedChannelUpdate {
 			htlc_minimum_msat: byte_utils::slice_to_be64(&v[48..56]),
 			fee_base_msat: byte_utils::slice_to_be32(&v[56..60]),
 			fee_proportional_millionths: byte_utils::slice_to_be32(&v[60..64]),
+			excess_data
 		})
 	}
 }
 impl MsgEncodable for UnsignedChannelUpdate {
 	fn encode(&self) -> Vec<u8> {
-		let mut res = Vec::with_capacity(64);
+		let mut res = Vec::with_capacity(64 + self.excess_data.len());
 		res.extend_from_slice(&self.chain_hash[..]);
 		res.extend_from_slice(&byte_utils::be64_to_array(self.short_channel_id));
 		res.extend_from_slice(&byte_utils::be32_to_array(self.timestamp));
@@ -1457,6 +1475,7 @@ impl MsgEncodable for UnsignedChannelUpdate {
 		res.extend_from_slice(&byte_utils::be64_to_array(self.htlc_minimum_msat));
 		res.extend_from_slice(&byte_utils::be32_to_array(self.fee_base_msat));
 		res.extend_from_slice(&byte_utils::be32_to_array(self.fee_proportional_millionths));
+		res.extend_from_slice(&self.excess_data[..]);
 		res
 	}
 }