diff options
| author | Joshua Colp <jcolp@digium.com> | 2012-10-11 13:34:52 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2012-10-11 13:34:52 +0000 |
| commit | 755c2b87088bdc0313aca260d22255c2a494addb (patch) | |
| tree | e8f837d537eb266aac7de663dacc6b5df20a9e01 /channels/chan_motif.c | |
| parent | 516c9ec665ed910139bd8583c20e78f3839078e4 (diff) | |
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
Diffstat (limited to 'channels/chan_motif.c')
| -rw-r--r-- | channels/chan_motif.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_motif.c b/channels/chan_motif.c index 6c62f6aad..972abdb7b 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; } |