mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly set the “from” of the ping results to the correct full JID

Browse Source
This commit is contained in:
louiz’
2016-06-24 11:23:01 +02:00
parent 4e959a3869
commit b2e7edeea8
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
louloulibs/xmpp/xmpp_component.cpp
+10
View File
@@ -631,6 +631,16 @@ void XmppComponent::send_iq_version_request(const std::string& from,
this->send_stanza(iq);
}
void XmppComponent::send_iq_result_full_jid(const std::string& id, const std::string& to_jid, const std::string& from_full_jid)
{
Stanza iq("iq");
iq["from"] = from_full_jid;
iq["to"] = to_jid;
iq["id"] = id;
iq["type"] = "result";
this->send_stanza(iq);
}
void XmppComponent::send_iq_result(const std::string& id, const std::string& to_jid, const std::string& from_local_part)
{
Stanza iq("iq");
louloulibs/xmpp/xmpp_component.hpp
+2
View File
@@ -200,6 +200,8 @@ public:
* Send an empty iq of type result
*/
void send_iq_result(const std::string& id, const std::string& to_jid, const std::string& from);
void send_iq_result_full_jid(const std::string& id, const std::string& to_jid,
const std::string& from_full_jid);
void handle_handshake(const Stanza& stanza);
void handle_error(const Stanza& stanza);
src/bridge/bridge.cpp
+1 -2
View File
@@ -483,8 +483,7 @@ void Bridge::send_irc_user_ping_request(const std::string& irc_hostname, const s
const std::string id = body.substr(6, body.size() - 7);
if (id != iq_id)
return false;
Jid jid(from_jid);
this->xmpp.send_iq_result(iq_id, to_jid, jid.local);
this->xmpp.send_iq_result_full_jid(iq_id, to_jid, from_jid);
return true;
}
if (message.command == "401" && message.arguments[1] == nick)