pep/xmpp-rs-mirror
1
0
Fork 0
mirror of https://gitlab.com/xmpp-rs/xmpp-rs.git synced 2024-07-12 22:21:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "client: add more state to make close() send </stream:stream>"

Browse source 
This reverts commit 6379f91e02.
This commit is contained in:
Astro 2019-01-29 01:34:44 +01:00
parent 234450b9d1
commit be78f6578b
1 changed files with 9 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/client/mod.rs
View file

@ -35,8 +35,6 @@ enum ClientState {
Disconnected,
Connecting(Box<Future<Item = XMPPStream, Error = Error>>),
Connected(XMPPStream),
ClosingSendEnd(futures::sink::Send<XMPPStream>),
ClosingClose(XMPPStream),
}
impl Client {
@ -190,14 +188,6 @@ impl Stream for Client {
Err(e) => Err(e)?,
}
}
ClientState::ClosingSendEnd(_) => {
self.state = state;
Ok(Async::NotReady)
}
ClientState::ClosingClose(_) => {
self.state = state;
Ok(Async::NotReady)
}
}
}
}
@ -229,40 +219,20 @@ impl Sink for Client {
fn poll_complete(&mut self) -> Poll<(), Self::SinkError> {
match self.state {
ClientState::Connected(ref mut stream) => stream.poll_complete().map_err(|e| e.into()),
ClientState::ClosingSendEnd(ref mut send) => {
match send.poll()? {
Async::NotReady =>
Ok(Async::NotReady),
Async::Ready(stream) => {
self.state = ClientState::ClosingClose(stream);
self.poll_complete()
}
}
}
ClientState::ClosingClose(ref mut stream) => {
match stream.close()? {
Async::NotReady =>
Ok(Async::NotReady),
Async::Ready(()) => {
self.state = ClientState::Disconnected;
Ok(Async::Ready(()))
}
}
}
_ => Ok(Async::Ready(())),
}
}
/// Send `</stream:stream> and later close the inner TCP stream.
/// This closes the inner TCP stream.
///
/// To synchronize your shutdown with the server side, you should
/// first send `Packet::StreamEnd` and wait for the end of the
/// incoming stream before closing the connection.
fn close(&mut self) -> Poll<(), Self::SinkError> {
let state = replace(&mut self.state, ClientState::Disconnected);
match state {
ClientState::Connected(stream) => {
let send = stream.send(Packet::StreamEnd);
self.state = ClientState::ClosingSendEnd(send);
self.poll_complete()
}
match self.state {
ClientState::Connected(ref mut stream) =>
stream.close()
.map_err(|e| e.into()),
_ =>
Ok(Async::Ready(())),
}