Merge pull request #375 from ethcore/net

Check for handshake expiration before attempting connection replace
openethereum · Feb 8, 2016 · 76d51a3 · 76d51a3
2 parents 666a1c3 + b411a3d
commit 76d51a3
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/util/src/network/host.rs b/util/src/network/host.rs
@@ -599,6 +599,9 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
 
 	fn start_session(&self, token: StreamToken, io: &IoContext<NetworkIoMessage<Message>>) {
 		let mut connections = self.connections.write().unwrap();
+		if connections.get(token).is_none() {
+			return; // handshake expired
+		}
 		connections.replace_with(token, |c| {
 			match Arc::try_unwrap(c).ok().unwrap().into_inner().unwrap() {
 				ConnectionEntry::Handshake(h) => {