diff options
| author | louiz’ <louiz@louiz.org> | 2017-03-04 14:00:53 +0100 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2017-03-04 14:03:08 +0100 |
| commit | d81c3ad5ac2c12130d90044b7597bf962a7cfe9e (patch) | |
| tree | f5e9dec2fec5ceec917cc9c0b87371393a085b66 | |
| parent | e6e37a6f209ae2e9416b0da03ff21469cb4645b8 (diff) | |
| download | biboumi-d81c3ad5ac2c12130d90044b7597bf962a7cfe9e.tar.gz biboumi-d81c3ad5ac2c12130d90044b7597bf962a7cfe9e.tar.bz2 biboumi-d81c3ad5ac2c12130d90044b7597bf962a7cfe9e.tar.xz biboumi-d81c3ad5ac2c12130d90044b7597bf962a7cfe9e.zip | |
Fix the order of from and to address in muc traffic info reply
And add a test for it.
fix #3238
| -rw-r--r-- | src/xmpp/biboumi_component.cpp | 2 | ||||
| -rw-r--r-- | src/xmpp/biboumi_component.hpp | 2 | ||||
| -rw-r--r-- | tests/end_to_end/__main__.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/xmpp/biboumi_component.cpp b/src/xmpp/biboumi_component.cpp index 663e92e..2783b93 100644 --- a/src/xmpp/biboumi_component.cpp +++ b/src/xmpp/biboumi_component.cpp @@ -738,7 +738,7 @@ void BiboumiComponent::send_irc_server_disco_info(const std::string& id, const s this->send_stanza(iq); } -void BiboumiComponent::send_irc_channel_muc_traffic_info(const std::string id, const std::string& jid_from, const std::string& jid_to) +void BiboumiComponent::send_irc_channel_muc_traffic_info(const std::string id, const std::string& jid_to, const std::string& jid_from) { Stanza iq("iq"); { diff --git a/src/xmpp/biboumi_component.hpp b/src/xmpp/biboumi_component.hpp index 7cafdec..aa0c3db 100644 --- a/src/xmpp/biboumi_component.hpp +++ b/src/xmpp/biboumi_component.hpp @@ -69,7 +69,7 @@ public: * Sends the allowed namespaces in MUC message, according to * http://xmpp.org/extensions/xep-0045.html#impl-service-traffic */ - void send_irc_channel_muc_traffic_info(const std::string id, const std::string& jid_from, const std::string& jid_to); + void send_irc_channel_muc_traffic_info(const std::string id, const std::string& jid_to, const std::string& jid_from); /** * Send a ping request */ diff --git a/tests/end_to_end/__main__.py b/tests/end_to_end/__main__.py index f93025e..c298793 100644 --- a/tests/end_to_end/__main__.py +++ b/tests/end_to_end/__main__.py @@ -1864,7 +1864,7 @@ if __name__ == '__main__': partial(send_stanza, "<iq from='{jid_one}/{resource_one}' to='#foo%{irc_server_one}' id='1' type='get'><query xmlns='http://jabber.org/protocol/disco#info' node='http://jabber.org/protocol/muc#traffic'/></iq>"), - partial(expect_stanza, "/iq[@type='result']/disco_info:query[@node='http://jabber.org/protocol/muc#traffic']"), + partial(expect_stanza, "/iq[@from='#foo%{irc_server_one}'][@to='{jid_one}/{resource_one}'][@type='result']/disco_info:query[@node='http://jabber.org/protocol/muc#traffic']"), ]), Scenario("raw_message", [ |