grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #722 from ethcore/network

Browse Source 
Fixed handshake leak
This commit is contained in:
Arkadiy Paronyan 2016-03-14 16:23:54 +01:00
commit d844de442a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/src/network/host.rs
View File

@ -687,6 +687,8 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
if h.expired { if h.expired {
return; return;
} }
io.deregister_stream(token).expect("Error deleting handshake registration");
h.set_expired();
let originated = h.originated; let originated = h.originated;
let mut session = match Session::new(&mut h, &self.info.read().unwrap()) { let mut session = match Session::new(&mut h, &self.info.read().unwrap()) {
Ok(s) => s, Ok(s) => s,
@ -705,8 +707,6 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
} }
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");
h.set_expired();
io.register_stream(session_token).expect("Error creating session registration"); io.register_stream(session_token).expect("Error creating session registration");
self.stats.inc_sessions(); self.stats.inc_sessions();
trace!(target: "network", "Creating session {} -> {}", token, session_token); trace!(target: "network", "Creating session {} -> {}", token, session_token);