pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

tokio-xmpp: Error out when the stream:features couldn’t be parsed

Browse source 
This is nicer than sleeping forever with no debug info whatsoever.
This commit is contained in:
Emmanuel Gil Peyrot 2024-08-03 15:52:15 +02:00
parent ba6a7c4744
commit 35932268af
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tokio-xmpp/src/stream_start.rs
View file

@ -1,7 +1,7 @@
use futures::{sink::SinkExt, stream::StreamExt}; use futures::{sink::SinkExt, stream::StreamExt};
use tokio::io::{AsyncRead, AsyncWrite}; use tokio::io::{AsyncRead, AsyncWrite};
use tokio_util::codec::Framed; use tokio_util::codec::Framed;
use xmpp_parsers::{jid::Jid, ns, stream_features::StreamFeatures}; use xmpp_parsers::{jid::Jid, ns, stream_features::StreamFeatures, Error as ParsersError};
use crate::error::{Error, ProtocolError}; use crate::error::{Error, ProtocolError};
use crate::xmpp_codec::{Packet, XmppCodec}; use crate::xmpp_codec::{Packet, XmppCodec};
@ -50,10 +50,10 @@ pub async fn start<S: AsyncRead + AsyncWrite + Unpin>(
loop { loop {
match stream.next().await { match stream.next().await {
Some(Ok(Packet::Stanza(stanza))) => { Some(Ok(Packet::Stanza(stanza))) => {
if let Ok(stream_features) = StreamFeatures::try_from(stanza) { let stream_features = StreamFeatures::try_from(stanza)
.map_err(|e| Error::Protocol(ParsersError::from(e).into()))?;
return Ok(XMPPStream::new(jid, stream, ns, stream_id, stream_features)); return Ok(XMPPStream::new(jid, stream, ns, stream_id, stream_features));
} }
}
Some(Ok(_)) => {} Some(Ok(_)) => {}
Some(Err(e)) => return Err(e.into()), Some(Err(e)) => return Err(e.into()),
None => return Err(Error::Disconnected), None => return Err(Error::Disconnected),