From df0928b64c9b32e5c2becf657055d905869eb207 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 19 Aug 2022 18:01:43 +0300 Subject: =?UTF-8?q?fixes=20#3165=20(VoiceService:=20=D0=BF=D0=B0=D0=B4?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B8=20=D0=B2=D1=85?= =?UTF-8?q?=D0=BE=D0=B4=D1=8F=D1=89=D0=B5=D0=BC=20=D0=B2=D1=8B=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protocols/JabberG/src/jabber_proto.h | 2 +- protocols/JabberG/src/jabber_thread.cpp | 2 +- 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, 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(); -- cgit v1.2.3