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

This commit is contained in:
debris
2016-02-15 15:22:43 +01:00
8 changed files with 173 additions and 78 deletions

View File

@@ -217,6 +217,7 @@ impl<'s, Message> NetworkContext<'s, Message> where Message: Send + Sync + Clone
s.send_packet(self.protocol, packet_id as u8, &data).unwrap_or_else(|e| {
warn!(target: "net", "Send error: {:?}", e);
}); //TODO: don't copy vector data
try!(self.io.update_registration(peer));
},
_ => warn!(target: "net", "Send: Peer is not connected yet")
}