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

Merge branch 'master' of github.com:ethcore/parity into network

Browse Source
This commit is contained in:
arkpar
2016-02-26 14:23:10 +01:00
parent 8beba717f8 6e5ae636cc
commit 34bc02af1e
44 changed files with 3839 additions and 1492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -609,7 +609,7 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
}
}
if kill {
self.kill_connection(token, io, true); //TODO: mark connection as dead an check in kill_connection
self.kill_connection(token, io, true);
return;
} else if create_session {
self.start_session(token, io);
@@ -651,7 +651,7 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
}
}
if kill {
self.kill_connection(token, io, true); //TODO: mark connection as dead an check in kill_connection
self.kill_connection(token, io, true);
}
for p in ready_data {
let h = self.handlers.read().unwrap().get(p).unwrap().clone();
@@ -716,6 +716,7 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
fn kill_connection(&self, token: StreamToken, io: &IoContext<NetworkIoMessage<Message>>, remote: bool) {
let mut to_disconnect: Vec<ProtocolId> = Vec::new();
let mut failure_id = None;
let mut deregister = false;
match token {
FIRST_HANDSHAKE ... LAST_HANDSHAKE => {
let handshakes = self.handshakes.write().unwrap();
@@ -724,7 +725,7 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
if !handshake.expired() {
handshake.set_expired();
failure_id = Some(handshake.id().clone());
io.deregister_stream(token).expect("Error deregistering stream");
deregister = true;
}
}
},
@@ -742,7 +743,7 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
}
s.set_expired();
failure_id = Some(s.id().clone());
io.deregister_stream(token).expect("Error deregistering stream");
deregister = true;
}
}
},
@@ -757,6 +758,9 @@ impl<Message> Host<Message> where Message: Send + Sync + Clone {
let h = self.handlers.read().unwrap().get(p).unwrap().clone();
h.disconnected(&NetworkContext::new(io, p, Some(token), self.sessions.clone()), &token);
}
if deregister {
io.deregister_stream(token).expect("Error deregistering stream");
}
}
fn update_nodes(&self, io: &IoContext<NetworkIoMessage<Message>>, node_changes: TableUpdates) {