pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-24 08:55:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the packet ID system (#900)

Browse Source
This commit is contained in:
Pierre Krieger
2018-10-16 12:57:42 +01:00
committed by Gav Wood
parent ac4bcf879f
commit 15fe5f7540
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/network-libp2p/src/custom_proto.rs
+3 -15
View File
@@ -112,11 +112,7 @@ impl<TSubstream> RegisteredProtocolSubstream<TSubstream> {
/// Sends a message to the substream. /// Sends a message to the substream.
pub fn send_message(&mut self, data: Bytes) { pub fn send_message(&mut self, data: Bytes) {
// TODO: remove the packet id system self.send_queue.push_back(data);
let mut message = Bytes::with_capacity(1 + data.len());
message.extend_from_slice(&[0]);
message.extend_from_slice(&data);
self.send_queue.push_back(message);
// If the length of the queue goes over a certain arbitrary threshold, we print a warning. // If the length of the queue goes over a certain arbitrary threshold, we print a warning.
// TODO: figure out a good threshold // TODO: figure out a good threshold
@@ -165,16 +161,8 @@ where TSubstream: AsyncRead + AsyncWrite,
// Note that `inner` is wrapped in a `Fuse`, therefore we can poll it forever. // Note that `inner` is wrapped in a `Fuse`, therefore we can poll it forever.
loop { loop {
match self.inner.poll()? { match self.inner.poll()? {
Async::Ready(Some(mut data)) => { Async::Ready(Some(mut data)) =>
// The `data` should be prefixed by the packet ID, therefore an empty return Ok(Async::Ready(Some(data.freeze()))),
// packet is invalid.
// TODO: remove the packet id system
if data.is_empty() {
return Err(io::Error::new(io::ErrorKind::Other, "bad packet"));
}
let data = data.split_off(1);
return Ok(Async::Ready(Some(data.freeze())))
},
Async::Ready(None) => Async::Ready(None) =>
if !self.requires_poll_complete && self.send_queue.is_empty() { if !self.requires_poll_complete && self.send_queue.is_empty() {
return Ok(Async::Ready(None)) return Ok(Async::Ready(None))