retronetworking/yate
12
0
Fork 2
Code Issues Pull requests Projects Releases Wiki Activity

Always set the correct message stanza type in dispatched msg.execute/route messages.

Browse source 
git-svn-id: http://voip.null.ro/svn/yate@4295 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2011-04-14 09:00:22 +00:00
parent 19c82b5bd6
commit d46bfaddf1
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/client/jabberclient.cpp
View file

@ -780,7 +780,8 @@ void YJBEngine::processEvent(JBEvent* ev)
if (processMucMessage(ev))
break;
Message* m = __plugin.message("msg.execute",ev->clientStream());
m->addParam("type",ev->stanzaType());
const char* tStr = ev->stanzaType();
m->addParam("type",tStr ? tStr : XMPPUtils::msgText(XMPPUtils::Normal));
m->addParam("id",ev->id(),false);
m->addParam("caller",ev->from().bare());
m->addParam("caller_instance",ev->from().resource(),false);

3
modules/jabber/jabberserver.cpp
View file

@ -3278,7 +3278,8 @@ void JBPendingWorker::processChat(JBPendingJob& job)
Message m("msg.route");
while (true) {
__plugin.complete(m);
m.addParam("type",ev->stanzaType());
const char* tStr = ev->stanzaType();
m.addParam("type",tStr ? tStr : XMPPUtils::msgText(XMPPUtils::Normal));
addValidParam(m,"id",ev->id());
m.addParam("caller",ev->from().bare());
addValidParam(m,"called",ev->to().bare());