respond to Jeff's comments and add node pubkeys to map

Author: arik-so

lightning/src/ln/peer_handler.rs

@@ -490,6 +490,19 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 						if let Some(conduit) = conduit_option {
 							// Rust 1.22 does not allow assignment in a borrowed context, even if mutable
 							peer.encryptor = PeerState::Connected(conduit);
+
+							// the handshake has finished, so one way or another, we now have their node id
+							match peers.node_id_to_descriptor.entry(peer.their_node_id.unwrap()) {
+								hash_map::Entry::Occupied(_) => {
+									log_trace!(self, "Got second connection with {}, closing", log_pubkey!(peer.their_node_id.unwrap()));
+									peer.their_node_id = None; // Unset so that we don't generate a peer_disconnected event
+									return Err(PeerHandleError{ no_connection_possible: false })
+								},
+								hash_map::Entry::Vacant(entry) => {
+									log_trace!(self, "Finished noise handshake for connection with {}", log_pubkey!(peer.their_node_id.unwrap()));
+									entry.insert(peer_descriptor.clone())
+								},
+							};
 						}
 
 						if let &mut PeerState::Connected(ref mut conduit) = &mut peer.encryptor {
@@ -531,7 +544,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
 								}
 							}
 
-							let mut next_message_result = conduit.decrypt(&peer.pending_read_buffer);
+							let next_message_result = conduit.decrypt(&peer.pending_read_buffer);
 
 							let offset = next_message_result.1;
 							if offset == 0 {

lightning/src/ln/peers/conduit.rs

@@ -38,7 +38,7 @@ impl Conduit {
 	}
 
 	pub(super) fn read(&mut self, data: &[u8]) {
-		let mut read_buffer = self.read_buffer.get_or_insert(Vec::new());
+		let read_buffer = self.read_buffer.get_or_insert(Vec::new());
 		read_buffer.extend_from_slice(data);
 	}