From 0b9f1c4e0df20500616fada4afb769eadfaf3f0e Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 12 Sep 2012 20:53:20 +0000 Subject: [PATCH] Skip any non-content information when looking for and handling content. This fixes a bug with Jitsi and conference calling. Jitsi implements XEP-0298 which places some conference-info information in the session-initiate request which chan_motif did not expect to occur. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@372995 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_motif.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/channels/chan_motif.c b/channels/chan_motif.c index 55c0f5e0bd..70629f4e0a 100644 --- a/channels/chan_motif.c +++ b/channels/chan_motif.c @@ -2098,10 +2098,16 @@ static int jingle_interpret_content(struct jingle_session *session, ikspak *pak) /* Look at the content in the session initiation */ for (content = iks_child(iks_child(pak->x)); content; content = iks_next(content)) { - char *name = iks_find_attrib(content, "name"); + char *name; struct ast_rtp_instance *rtp = NULL; iks *description, *transport; + if (strcmp(iks_name(content), "content")) { + continue; + } + + name = iks_find_attrib(content, "name"); + if (session->transport != JINGLE_TRANSPORT_GOOGLE_V1) { /* If this content stanza has no name consider it invalid and move on */ if (ast_strlen_zero(name) && !(name = iks_find_attrib(content, "jin:name"))) { -- 2.47.2