projects
/
asterisk/asterisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
516c9ec
)
Consider the Google Talk content stanza name (jin:content) valid.
author
Joshua Colp
<jcolp@digium.com>
Thu, 11 Oct 2012 13:34:52 +0000
(13:34 +0000)
committer
Joshua Colp
<jcolp@digium.com>
Thu, 11 Oct 2012 13:34:52 +0000
(13:34 +0000)
........
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
channels/chan_motif.c
patch
|
blob
|
history
diff --git
a/channels/chan_motif.c
b/channels/chan_motif.c
index
6c62f6a
..
972abdb
100644
(file)
--- 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;
}