X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fpeer_handler.rs;h=e01d2c9b89c4494d68b8720062de63147538a1fc;hb=4fbc0b37688411a7270fce20b44fb43944669823;hp=a6992eae4ff1fcf62dab20875407e2741dcebec5;hpb=cf6308a5aede0f3f1493cbfb32a1ad04c8961191;p=rust-lightning

diff --git a/src/ln/peer_handler.rs b/src/ln/peer_handler.rs
index a6992eae..e01d2c9b 100644
--- a/src/ln/peer_handler.rs
+++ b/src/ln/peer_handler.rs
@@ -40,16 +40,21 @@ pub trait SocketDescriptor : cmp::Eq + hash::Hash + Clone {
 /// generate no further read/write_events for the descriptor, only triggering a single
 /// disconnect_event (unless it was provided in response to a new_*_connection event, in which case
 /// no such disconnect_event must be generated and the socket be silently disconencted).
-pub struct PeerHandleError {}
+pub struct PeerHandleError {
+	no_connection_possible: bool,
+}
 impl fmt::Debug for PeerHandleError {
 	fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		formatter.write_str("Peer Send Invalid Data")
+		formatter.write_str("Peer Sent Invalid Data")
 	}
 }
 
 struct Peer {
 	channel_encryptor: PeerChannelEncryptor,
+	outbound: bool,
 	their_node_id: Option<PublicKey>,
+	their_global_features: Option<msgs::GlobalFeatures>,
+	their_local_features: Option<msgs::LocalFeatures>,
 
 	pending_outbound_buffer: LinkedList<Vec<u8>>,
 	pending_outbound_buffer_first_msg_offset: usize,
@@ -112,7 +117,10 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 		let mut peers = self.peers.lock().unwrap();
 		if peers.peers.insert(descriptor, Peer {
 			channel_encryptor: peer_encryptor,
+			outbound: true,
 			their_node_id: Some(their_node_id),
+			their_global_features: None,
+			their_local_features: None,
 
 			pending_outbound_buffer: LinkedList::new(),
 			pending_outbound_buffer_first_msg_offset: 0,
@@ -141,7 +149,10 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 		let mut peers = self.peers.lock().unwrap();
 		if peers.peers.insert(descriptor, Peer {
 			channel_encryptor: peer_encryptor,
+			outbound: false,
 			their_node_id: None,
+			their_global_features: None,
+			their_local_features: None,
 
 			pending_outbound_buffer: LinkedList::new(),
 			pending_outbound_buffer_first_msg_offset: 0,
@@ -279,6 +290,7 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 									let act_three = try_potential_handleerror!(peer.channel_encryptor.process_act_two(&peer.pending_read_buffer[..], &self.our_node_secret)).to_vec();
 									peer.pending_outbound_buffer.push_back(act_three);
 									peer.pending_read_buffer = [0; 18].to_vec(); // Message length header is 18 bytes
+									peer.pending_read_is_header = true;
 
 									insert_node_id = Some(peer.their_node_id.unwrap());
 									encode_and_send_msg!(msgs::Init {
@@ -307,6 +319,10 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 										assert!(msg_data.len() >= 2);
 
 										let msg_type = byte_utils::slice_to_be16(&msg_data[0..2]);
+										if msg_type != 16 && peer.their_global_features.is_none() {
+											// Need an init message as first message
+											return Err(PeerHandleError{});
+										}
 										match msg_type {
 											// Connection control:
 											16 => {
@@ -317,7 +333,15 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 												if msg.local_features.requires_unknown_bits() {
 													return Err(PeerHandleError{});
 												}
-												//TODO: Store features!
+												peer.their_global_features = Some(msg.global_features);
+												peer.their_local_features = Some(msg.local_features);
+
+												if !peer.outbound {
+													encode_and_send_msg!(msgs::Init {
+														global_features: msgs::GlobalFeatures::new(),
+														local_features: msgs::LocalFeatures::new(),
+													}, 16);
+												}
 											},
 											17 => {
 												// Error msg