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

tokio-xmpp: @id wasn't correctly added to every stanza

Browse source 
This commit moves the code adding @id to AsyncClient and SimpleClient,
instead of on the lower level send_stanza helper, which seemed to only
be used internally.

Support is also added for Component.

This removes the addition of @id on elements like <auth/> or <bind/>,
which probably weren't required anyway?

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2023-06-04 19:01:45 +02:00
parent 6fa6deddcb
commit bc73af1e5e
Signed by: pep
GPG key ID: DEDA74AEECA9D0F2
4 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tokio-xmpp/src/client/async_client.rs
View file

@ -17,7 +17,7 @@ use crate::event::Event;
use crate::happy_eyeballs::{connect_to_host, connect_with_srv};
use crate::starttls::starttls;
use crate::xmpp_codec::Packet;
use crate::xmpp_stream;
use crate::xmpp_stream::{self, make_id};
use crate::{Error, ProtocolError};
/// XMPP client connection and state
@ -161,7 +161,11 @@ impl Client {
/// Send stanza
pub async fn send_stanza(&mut self, stanza: Element) -> Result<(), Error> {
self.send(Packet::Stanza(stanza)).await
let mut el: Element = stanza;
if el.attr("id").is_none() {
el.set_attr("id", make_id());
}
self.send(Packet::Stanza(el)).await
}
/// End connection by sending `</stream:stream>`

8
tokio-xmpp/src/client/simple_client.rs
View file

@ -17,7 +17,7 @@ use super::bind::bind;
use crate::happy_eyeballs::connect_with_srv;
use crate::starttls::starttls;
use crate::xmpp_codec::Packet;
use crate::xmpp_stream;
use crate::xmpp_stream::{self, make_id};
use crate::{Error, ProtocolError};
/// A simple XMPP client connection
@ -98,7 +98,11 @@ impl Client {
where
E: Into<Element>,
{
self.send(Packet::Stanza(stanza.into())).await
let mut el: Element = stanza.into();
if el.attr("id").is_none() {
el.set_attr("id", make_id());
}
self.send(Packet::Stanza(el.into())).await
}
/// End connection by sending `</stream:stream>`

7
tokio-xmpp/src/component/mod.rs
View file

@ -12,6 +12,7 @@ use super::happy_eyeballs::connect_to_host;
use super::xmpp_codec::Packet;
use super::xmpp_stream;
use super::Error;
use crate::xmpp_stream::make_id;
mod auth;
@ -53,7 +54,11 @@ impl Component {
/// Send stanza
pub async fn send_stanza(&mut self, stanza: Element) -> Result<(), Error> {
self.send(stanza).await
let mut el: Element = stanza;
if el.attr("id").is_none() {
el.set_attr("id", make_id());
}
self.send(el).await
}
/// End connection

8
tokio-xmpp/src/xmpp_stream.rs
View file

@ -14,7 +14,7 @@ use crate::stream_start;
use crate::xmpp_codec::{Packet, XMPPCodec};
use crate::Error;
fn make_id() -> String {
pub(crate) fn make_id() -> String {
let id: u64 = thread_rng().gen();
format!("{}", id)
}
@ -78,11 +78,7 @@ impl<S: AsyncRead + AsyncWrite + Unpin> XMPPStream<S> {
impl<S: AsyncRead + AsyncWrite + Unpin> XMPPStream<S> {
/// Convenience method
pub fn send_stanza<E: Into<Element>>(&mut self, e: E) -> Send<Self, Packet> {
let mut el: Element = e.into();
if el.attr("id").is_none() {
el.set_attr("id", make_id());
}
self.send(Packet::Stanza(el))
self.send(Packet::Stanza(e.into()))
}
}