From: Joshua Colp <jcolp@digium.com>
Date: Thu, 11 Oct 2012 13:34:52 +0000 (+0000)
Subject: Consider the Google Talk content stanza name (jin:content) valid.
X-Git-Tag: 13.0.0-beta1~2441
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=755c2b87088bdc0313aca260d22255c2a494addb;p=thirdparty%2Fasterisk.git

Consider the Google Talk content stanza name (jin:content) valid.
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index 6c62f6aad3..972abdb7b4 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -2111,7 +2111,8 @@ static int jingle_interpret_content(struct jingle_session *session, ikspak *pak)
 		struct ast_rtp_instance *rtp = NULL;
 		iks *description, *transport;
 
-		if (strcmp(iks_name(content), "content")) {
+		if (strcmp(iks_name(content), "content") &&
+		    strcmp(iks_name(content), "jin:content")) {
 			continue;
 		}