XEP-0410: implement server-side optimisation for self-pings
This prevents the ping from round-tripping through IRC and possibly a random other client of the user. Please see XEP-0410 for the rationale. Fixes #3385.
This commit is contained in:
@@ -747,6 +747,23 @@ void Bridge::send_irc_participant_ping_request(const Iid& iid, const std::string
|
||||
"", true);
|
||||
return;
|
||||
}
|
||||
if (chan->get_self()->nick == nick)
|
||||
{
|
||||
// XEP-0410 self-ping optimisation: always reply without going the full
|
||||
// round-trip through IRC and possibly another XMPP client. See the XEP
|
||||
// for details.
|
||||
Jid iq_from(from_jid);
|
||||
iq_from.local = std::to_string(iid);
|
||||
iq_from.resource = nick;
|
||||
|
||||
Stanza iq("iq");
|
||||
iq["from"] = iq_from.full();
|
||||
iq["to"] = to_jid;
|
||||
iq["id"] = iq_id;
|
||||
iq["type"] = "result";
|
||||
this->xmpp.send_stanza(iq);
|
||||
return;
|
||||
}
|
||||
if (chan->get_self()->nick != nick && !chan->find_user(nick))
|
||||
{
|
||||
this->xmpp.send_stanza_error("iq", to_jid, from_jid, iq_id, "cancel", "item-not-found",
|
||||
|
||||
@@ -997,7 +997,7 @@ void BiboumiComponent::send_irc_channel_disco_info(const std::string& id, const
|
||||
identity["category"] = "conference";
|
||||
identity["type"] = "irc";
|
||||
identity["name"] = ""s + iid.get_local() + " on " + iid.get_server();
|
||||
for (const char *ns: {DISCO_INFO_NS, MUC_NS, ADHOC_NS, PING_NS, MAM_NS, VERSION_NS, STABLE_MUC_ID_NS})
|
||||
for (const char *ns: {DISCO_INFO_NS, MUC_NS, ADHOC_NS, PING_NS, MAM_NS, VERSION_NS, STABLE_MUC_ID_NS, SELF_PING_FLAG})
|
||||
{
|
||||
XmlSubNode feature(query, "feature");
|
||||
feature["var"] = ns;
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
#define MUC_TRAFFIC_NS "http://jabber.org/protocol/muc#traffic"
|
||||
#define STABLE_ID_NS "urn:xmpp:sid:0"
|
||||
#define STABLE_MUC_ID_NS "http://jabber.org/protocol/muc#stable_id"
|
||||
#define SELF_PING_FLAG MUC_NS"#self-ping-optimization"
|
||||
|
||||
/**
|
||||
* An XMPP component, communicating with an XMPP server using the protocole
|
||||
|
||||
Reference in New Issue
Block a user