pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-09 22:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add reason for closing and fix multiple substreams (#2437)

Browse Source
This commit is contained in:
Pierre Krieger
2019-05-01 09:42:54 +02:00
committed by Gavin Wood
parent 407511100c
commit dbff5c4962
3 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/network-libp2p/src/behaviour.rs
+5 -5
View File
@@ -29,7 +29,7 @@ use libp2p::mdns::{Mdns, MdnsEvent};
use libp2p::multiaddr::Protocol;
use libp2p::ping::{Ping, PingConfig, PingEvent, PingSuccess};
use log::{debug, info, trace, warn};
use std::{cmp, io, fmt, time::Duration};
use std::{borrow::Cow, cmp, fmt, time::Duration};
use tokio_io::{AsyncRead, AsyncWrite};
use tokio_timer::{Delay, clock::Clock};
use void;
@@ -181,8 +181,8 @@ pub enum BehaviourOut<TMessage> {
CustomProtocolClosed {
/// Id of the peer we were connected to.
peer_id: PeerId,
/// Reason why the substream closed. If `Ok`, then it's a graceful exit (EOF).
result: io::Result<()>,
/// Reason why the substream closed, for diagnostic purposes.
reason: Cow<'static, str>,
},
/// Receives a message on a custom protocol substream.
@@ -224,8 +224,8 @@ impl<TMessage> From<CustomProtoOut<TMessage>> for BehaviourOut<TMessage> {
CustomProtoOut::CustomProtocolOpen { version, peer_id, endpoint } => {
BehaviourOut::CustomProtocolOpen { version, peer_id, endpoint }
}
CustomProtoOut::CustomProtocolClosed { peer_id, result } => {
BehaviourOut::CustomProtocolClosed { peer_id, result }
CustomProtoOut::CustomProtocolClosed { peer_id, reason } => {
BehaviourOut::CustomProtocolClosed { peer_id, reason }
}
CustomProtoOut::CustomMessage { peer_id, message } => {
BehaviourOut::CustomMessage { peer_id, message }
substrate/core/network-libp2p/src/custom_proto/behaviour.rs
+9 -9
View File
@@ -22,7 +22,7 @@ use libp2p::core::swarm::{ConnectedPoint, NetworkBehaviour, NetworkBehaviourActi
use libp2p::core::{Multiaddr, PeerId};
use log::{debug, error, trace, warn};
use smallvec::SmallVec;
use std::{collections::hash_map::Entry, cmp, error, io, marker::PhantomData, mem, time::Duration, time::Instant};
use std::{borrow::Cow, collections::hash_map::Entry, cmp, error, marker::PhantomData, mem, time::Duration, time::Instant};
use tokio_io::{AsyncRead, AsyncWrite};
use tokio_timer::clock::Clock;
@@ -182,8 +182,8 @@ pub enum CustomProtoOut<TMessage> {
CustomProtocolClosed {
/// Id of the peer we were connected to.
peer_id: PeerId,
/// Reason why the substream closed. If `Ok`, then it's a graceful exit (EOF).
result: io::Result<()>,
/// Reason why the substream closed, for debugging purposes.
reason: Cow<'static, str>,
},
/// Receives a message on a custom protocol substream.
@@ -696,7 +696,7 @@ where
debug!(target: "sub-libp2p", "External API <= Closed({:?})", peer_id);
let event = CustomProtoOut::CustomProtocolClosed {
peer_id: peer_id.clone(),
result: Ok(()),
reason: "Disconnected by libp2p".into(),
};
self.events.push(NetworkBehaviourAction::GenerateEvent(event));
@@ -713,7 +713,7 @@ where
debug!(target: "sub-libp2p", "External API <= Closed({:?})", peer_id);
let event = CustomProtoOut::CustomProtocolClosed {
peer_id: peer_id.clone(),
result: Ok(()),
reason: "Disconnected by libp2p".into(),
};
self.events.push(NetworkBehaviourAction::GenerateEvent(event));
@@ -730,7 +730,7 @@ where
debug!(target: "sub-libp2p", "External API <= Closed({:?})", peer_id);
let event = CustomProtoOut::CustomProtocolClosed {
peer_id: peer_id.clone(),
result: Ok(()),
reason: "Disconnected by libp2p".into(),
};
self.events.push(NetworkBehaviourAction::GenerateEvent(event));
@@ -802,8 +802,8 @@ where
event: CustomProtoHandlerOut<TMessage>,
) {
match event {
CustomProtoHandlerOut::CustomProtocolClosed { result } => {
debug!(target: "sub-libp2p", "Handler({:?}) => Closed({:?})", source, result);
CustomProtoHandlerOut::CustomProtocolClosed { reason } => {
debug!(target: "sub-libp2p", "Handler({:?}) => Closed: {}", source, reason);
let mut entry = if let Entry::Occupied(entry) = self.peers.entry(source.clone()) {
entry
@@ -814,7 +814,7 @@ where
debug!(target: "sub-libp2p", "External API <= Closed({:?})", source);
let event = CustomProtoOut::CustomProtocolClosed {
result,
reason,
peer_id: source.clone(),
};
self.events.push(NetworkBehaviourAction::GenerateEvent(event));
substrate/core/network-libp2p/src/custom_proto/handler.rs
+17 -15
View File
@@ -27,7 +27,7 @@ use libp2p::core::{
};
use log::{debug, error};
use smallvec::{smallvec, SmallVec};
use std::{error, fmt, io, marker::PhantomData, mem, time::Duration, time::Instant};
use std::{borrow::Cow, error, fmt, io, marker::PhantomData, mem, time::Duration, time::Instant};
use tokio_io::{AsyncRead, AsyncWrite};
use tokio_timer::{Delay, clock::Clock};
use void::Void;
@@ -231,8 +231,8 @@ pub enum CustomProtoHandlerOut<TMessage> {
/// Closed a custom protocol with the remote.
CustomProtocolClosed {
/// Reason why the substream closed. If `Ok`, then it's a graceful exit (EOF).
result: io::Result<()>,
/// Reason why the substream closed, for diagnostic purposes.
reason: Cow<'static, str>,
},
/// Receives a message on a custom protocol substream.
@@ -329,7 +329,7 @@ where
shutdown.push(substream);
}
let event = CustomProtoHandlerOut::CustomProtocolClosed {
result: Ok(())
reason: "Disabled on purpose on our side".into()
};
self.events_queue.push(ProtocolsHandlerEvent::Custom(event));
ProtocolState::Disabled {
@@ -394,7 +394,7 @@ where
}
}
ProtocolState::Normal { mut substreams, shutdown } => {
ProtocolState::Normal { mut substreams, mut shutdown } => {
for n in (0..substreams.len()).rev() {
let mut substream = substreams.swap_remove(n);
match substream.poll() {
@@ -416,20 +416,22 @@ where
return Some(ProtocolsHandlerEvent::Custom(event));
}
Ok(Async::Ready(None)) => {
let event = CustomProtoHandlerOut::CustomProtocolClosed {
result: Ok(())
};
substreams.push(substream);
self.state = ProtocolState::Disabled {
shutdown: shutdown.into_iter().collect(),
reenable: true
};
return Some(ProtocolsHandlerEvent::Custom(event));
shutdown.push(substream);
if substreams.is_empty() {
let event = CustomProtoHandlerOut::CustomProtocolClosed {
reason: "All substreams have been closed by the remote".into(),
};
self.state = ProtocolState::Disabled {
shutdown: shutdown.into_iter().collect(),
reenable: true
};
return Some(ProtocolsHandlerEvent::Custom(event));
}
}
Err(err) => {
if substreams.is_empty() {
let event = CustomProtoHandlerOut::CustomProtocolClosed {
result: Err(err),
reason: format!("Error on the last substream: {:?}", err).into(),
};
self.state = ProtocolState::Disabled {
shutdown: shutdown.into_iter().collect(),