Merge pull request #693 from ethcore/network

Limit incoming connections
This commit is contained in:
Marek Kotewicz 2016-03-13 10:11:42 +01:00
commit 70624f816a

View File

@ -541,7 +541,7 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
match TcpStream::connect(&address) { match TcpStream::connect(&address) {
Ok(socket) => socket, Ok(socket) => socket,
Err(e) => { Err(e) => {
warn!("Can't connect to address {:?}: {:?}", address, e); debug!("Can't connect to address {:?}: {:?}", address, e);
return; return;
} }
} }
@ -695,6 +695,14 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
return; return;
} }
}; };
if !originated {
let session_count = sessions.count();
let ideal_peers = { self.info.read().unwrap().deref().config.ideal_peers };
if session_count >= ideal_peers as usize {
session.disconnect(DisconnectReason::TooManyPeers);
return;
}
}
let result = sessions.insert_with(move |session_token| { let result = sessions.insert_with(move |session_token| {
session.set_token(session_token); session.set_token(session_token);
io.deregister_stream(token).expect("Error deleting handshake registration"); io.deregister_stream(token).expect("Error deleting handshake registration");