xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xmpp-parsers: Reduce component handshake allocations

Browse source 
This function always appends to an existing string, so by passing it a
String directly we can avoid superfluous allocations.

Also tokio-xmpp was doing a bunch of &str to String for no reason around
there, let’s remove that too.
This commit is contained in:
Emmanuel Gil Peyrot 2025-02-10 15:30:08 +01:00 • committed by pep
commit c497967b1c
4 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tokio-xmpp/src/component/login.rs
View file

@ -12,15 +12,14 @@ use crate::xmlstream::{ReadError, Timeouts, XmppStream, XmppStreamElement};
pub async fn component_login<C: ServerConnector>(
connector: C,
jid: Jid,
password: String,
password: &str,
timeouts: Timeouts,
) -> Result<XmppStream<C::Stream>, Error> {
let password = password;
let (mut stream, _) = connector.connect(&jid, ns::COMPONENT, timeouts).await?;
let header = stream.take_header();
let mut stream = stream.skip_features();
let stream_id = match header.id {
Some(ref v) => &**v,
Some(id) => id.into_owned(),
None => {
return Err(io::Error::new(
io::ErrorKind::InvalidData,
@ -29,16 +28,16 @@ pub async fn component_login<C: ServerConnector>(
.into())
}
};
auth(&mut stream, stream_id, &password).await?;
auth(&mut stream, stream_id, password).await?;
Ok(stream)
}
pub async fn auth<S: AsyncBufRead + AsyncWrite + Unpin>(
stream: &mut XmppStream<S>,
stream_id: &str,
stream_id: String,
password: &str,
) -> Result<(), Error> {
let nonza = Handshake::from_password_and_stream_id(password, stream_id);
let nonza = Handshake::from_stream_id_and_password(stream_id, password);
stream
.send(&XmppStreamElement::ComponentHandshake(nonza))
.await?;