summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2012-10-11 21:19:33 +0000
committerJoshua Colp <jcolp@digium.com>2012-10-11 21:19:33 +0000
commitccb7b3a1b57137f7358f376cc18682e6a64c5f34 (patch)
tree3d3a4b6513e603d67b17fb185ca94832ec143a3f
parentcd9745be1b76bef26a811c45094bc8bda14a97d2 (diff)
Fix a bug where audio on Google Voice would not work due to ignoring candidates.
Instead of ignoring parts of the message that are not known just ignore the ones we know may be present and that would cause a problem. ........ Merged revisions 374877 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374878 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_motif.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index 432685bd5..5380f1cd9 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -2117,8 +2117,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") &&
- strcmp(iks_name(content), "jin:content")) {
+ /* Ignore specific parts if they are known not to be useful */
+ if (!strcmp(iks_name(content), "conference-info")) {
continue;
}