Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-08 12:21:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix borrow error

Browse source
This commit is contained in:
Ignotus Peverell 2019-01-09 20:24:57 +00:00
parent 7a44ee9aa0
commit 26d250bbea
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
p2p/src/serv.rs
View file

@ -86,9 +86,6 @@ impl Server {
if !self.check_banned(&stream) { if !self.check_banned(&stream) {
let sc = stream.try_clone(); let sc = stream.try_clone();
if let Err(e) = self.handle_new_peer(stream) { if let Err(e) = self.handle_new_peer(stream) {
// in theory, should be shutdown when stream gets dropped,
// practically doesn't seem to be happening
stream.shutdown(Shutdown::Both);
warn!("Error accepting peer {}: {:?}", peer_addr.to_string(), e); warn!("Error accepting peer {}: {:?}", peer_addr.to_string(), e);
} else if let Ok(s) = sc { } else if let Ok(s) = sc {
connected_sockets.insert(peer_addr, s); connected_sockets.insert(peer_addr, s);
@ -176,13 +173,21 @@ impl Server {
let total_diff = self.peers.total_difficulty(); let total_diff = self.peers.total_difficulty();
// accept the peer and add it to the server map // accept the peer and add it to the server map
let mut peer = Peer::accept( let mut peer = match Peer::accept(
&mut stream, &mut stream,
self.capabilities, self.capabilities,
total_diff, total_diff,
&self.handshake, &self.handshake,
self.peers.clone(), self.peers.clone(),
)?; ) {
Ok(p) => p,
Err(e) => {
// in theory, should be shutdown when stream gets dropped,
// practically doesn't seem to be happening
let _ = stream.shutdown(Shutdown::Both);
return Err(e);
}
};
peer.start(stream); peer.start(stream);
self.peers.add_connected(Arc::new(peer))?; self.peers.add_connected(Arc::new(peer))?;
Ok(()) Ok(())