summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2016-06-24 11:23:01 +0200
committerlouiz’ <louiz@louiz.org>2016-06-24 11:23:01 +0200
commitb2e7edeea8bf08b6b7e75d60af3af0c30fdaa4f3 (patch)
treefb991c28f6edce2e25c37d2394bb67d7f743dc1b /src
parent4e959a3869c4a69b9d59de69694644c37380ff11 (diff)
downloadbiboumi-b2e7edeea8bf08b6b7e75d60af3af0c30fdaa4f3.tar.gz
biboumi-b2e7edeea8bf08b6b7e75d60af3af0c30fdaa4f3.tar.bz2
biboumi-b2e7edeea8bf08b6b7e75d60af3af0c30fdaa4f3.tar.xz
biboumi-b2e7edeea8bf08b6b7e75d60af3af0c30fdaa4f3.zip
Properly set the “from” of the ping results to the correct full JID
Diffstat (limited to 'src')
-rw-r--r--src/bridge/bridge.cpp3
-rw-r--r--src/xmpp/biboumi_component.cpp4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/bridge/bridge.cpp b/src/bridge/bridge.cpp
index 4976ed2..eee4bd2 100644
--- a/src/bridge/bridge.cpp
+++ b/src/bridge/bridge.cpp
@@ -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)
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp
index 62e17d0..e4d4899 100644
--- a/src/xmpp/biboumi_component.cpp
+++ b/src/xmpp/biboumi_component.cpp
@@ -580,8 +580,8 @@ void BiboumiComponent::send_iq_version_request(const std::string& from,
}
void BiboumiComponent::send_ping_request(const std::string& from,
- const std::string& jid_to,
- const std::string& id)
+ const std::string& jid_to,
+ const std::string& id)
{
Stanza iq("iq");
iq["type"] = "get";