diff options
| -rw-r--r-- | protocols/JabberG/src/jabber_proto.h | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_voip.cpp | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index 2e5272c4e8..dfd9fb9dcd 100644 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -895,7 +895,7 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface //---- jabber_voip.c -----------------------------------------------------------------
- bool OnICECandidate(const TiXmlElement *Node, const char *from);
+ bool OnICECandidate(const TiXmlElement *Node);
bool OnRTPDescription(const TiXmlElement *Node);
bool VOIPCreatePipeline();
bool VOIPTerminateSession(const char *reason = "cancel");
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 7870c6f7ba..f64651169d 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1869,7 +1869,7 @@ bool CJabberProto::OnProcessJingle(const TiXmlElement *node) if (m_bEnableVOIP && m_voipSession == szSid && transport) {
m_ThreadInfo->send(XmlNodeIq("result", idStr, from));
if (const TiXmlElement *candidate = XmlFirstChild(transport, "candidate")) {
- OnICECandidate(candidate, from);
+ OnICECandidate(candidate);
return true;
}
}
diff --git a/protocols/JabberG/src/jabber_voip.cpp b/protocols/JabberG/src/jabber_voip.cpp index 5a12a22ec9..aefd9b20a9 100644 --- a/protocols/JabberG/src/jabber_voip.cpp +++ b/protocols/JabberG/src/jabber_voip.cpp @@ -439,8 +439,11 @@ bool CJabberProto::OnRTPDescription(const TiXmlElement *jingleNode) return true; } -bool CJabberProto::OnICECandidate(const TiXmlElement *Node, const char *) +bool CJabberProto::OnICECandidate(const TiXmlElement *Node) { + if (!m_bEnableVOIP) + return false; + CMStringA scandidate; CMStringA proto(XmlGetAttr(Node, "protocol")); proto.MakeUpper(); |