X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fpeer_handler.rs;h=84870143008a3f19bd47fe2a303a897760bba516;hb=ec3aa494953c7d720370119f673e8e6b3a2155d5;hp=bb4b076b1bef313c72486a5d00b3494b66fdbaef;hpb=a5ecb851716bc0819586894232653ec4b5e2c67f;p=rust-lightning

diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
index bb4b076b..84870143 100644
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@ -28,7 +28,7 @@ use crate::ln::peer_channel_encryptor::{PeerChannelEncryptor,NextNoiseStep};
 use crate::ln::wire;
 use crate::ln::wire::Encode;
 use crate::onion_message::{CustomOnionMessageContents, CustomOnionMessageHandler, SimpleArcOnionMessenger, SimpleRefOnionMessenger};
-use crate::routing::gossip::{NetworkGraph, P2PGossipSync, NodeId};
+use crate::routing::gossip::{NetworkGraph, P2PGossipSync, NodeId, NodeAlias};
 use crate::util::atomic_counter::AtomicCounter;
 use crate::util::logger::Logger;
 
@@ -1056,7 +1056,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 		match self.do_read_event(peer_descriptor, data) {
 			Ok(res) => Ok(res),
 			Err(e) => {
-				log_trace!(self.logger, "Peer sent invalid data or we decided to disconnect due to a protocol error");
+				log_trace!(self.logger, "Disconnecting peer due to a protocol error (usually a duplicate connection).");
 				self.disconnect_event_internal(peer_descriptor);
 				Err(e)
 			}
@@ -2103,7 +2103,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 						if let Some((node_id, _)) = peer.their_node_id {
 							self.node_id_to_descriptor.lock().unwrap().remove(&node_id);
 						}
-						self.do_disconnect(descriptor, &*peer, "ping timeout");
+						self.do_disconnect(descriptor, &*peer, "ping/handshake timeout");
 					}
 				}
 			}
@@ -2153,7 +2153,9 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 			features,
 			timestamp: self.last_node_announcement_serial.fetch_add(1, Ordering::AcqRel),
 			node_id: NodeId::from_pubkey(&self.node_signer.get_node_id(Recipient::Node).unwrap()),
-			rgb, alias, addresses,
+			rgb,
+			alias: NodeAlias(alias),
+			addresses,
 			excess_address_data: Vec::new(),
 			excess_data: Vec::new(),
 		};