[asterisk-commits] file: trunk r372996 - in /trunk: ./ channels/chan_motif.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Sep 12 15:54:38 2012
New Revision: 372996

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=372996
Log:
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.
........

Merged revisions 372995 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/channels/chan_motif.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/channels/chan_motif.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_motif.c?view=diff&rev=372996&r1=372995&r2=372996
==============================================================================
--- trunk/channels/chan_motif.c (original)
+++ trunk/channels/chan_motif.c Wed Sep 12 15:54:38 2012
@@ -2098,9 +2098,15 @@
 
 	/* 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 */