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

Fixed stanza/stream error decoding. 

git-svn-id: http://voip.null.ro/svn/yate@2903 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2009-11-09 13:10:16 +00:00
parent 5864092eea
commit cc6fc01ad0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/yjabber/xmpputils.cpp
View File

@ -1012,7 +1012,8 @@ void XMPPUtils::decodeError(XmlElement* xml, String& error, String& text)
case XmlTag::Presence:
case XmlTag::Message:
// Stanza in stream namespace
if (ns == XMPPNamespace::Server || ns == XMPPNamespace::Client)
if (ns == XMPPNamespace::Server || ns == XMPPNamespace::Client ||
ns == XMPPNamespace::ComponentAccept)
decodeError(xml,true,error,text);
break;
}
@ -1023,7 +1024,13 @@ void XMPPUtils::decodeError(XmlElement* xml, bool stanza, String& error, String&
{
if (!xml)
return;
int ns = stanza ? XMPPNamespace::StanzaError : XMPPNamespace::StreamError;
int ns = stanza ? XMPPNamespace::StanzaError: XMPPNamespace::StreamError;
if (stanza) {
String* xmlns = xml->xmlns();
xml = xml->findFirstChild(&s_tag[XmlTag::Error],xmlns);
if (!xml)
return;
}
XmlElement* ch = findFirstChild(*xml,XmlTag::Count,ns);
for (; ch; ch = findNextChild(*xml,ch,XmlTag::Count,ns)) {
if (ch->unprefixedTag() != s_tag[XmlTag::Text])