summaryrefslogtreecommitdiff
path: root/channels/chan_motif.c
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2012-07-10 15:25:12 +0000
committerJoshua Colp <jcolp@digium.com>2012-07-10 15:25:12 +0000
commit55871d3a67a824c55b8cbf72f534f0d310836c81 (patch)
tree200ce76adf86696bb1a7b04a5dfc761171d1decc /channels/chan_motif.c
parent74ebe6d5aba740c5586ee13dba9b8e0b778fd76a (diff)
Add additional description stanza names from the old Google Talk protocol which is used with Google Voice.
(closes issue ASTERISK-20114) Reported by: Malcolm Davenport git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369898 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_motif.c')
-rw-r--r--channels/chan_motif.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index 0a816a5c8..ff39bf1e1 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -2100,7 +2100,9 @@ static int jingle_interpret_content(struct jingle_session *session, ikspak *pak)
/* If description information is available use it */
if ((description = iks_find_with_attrib(content, "description", "xmlns", JINGLE_RTP_NS)) ||
(description = iks_find_with_attrib(content, "rtp:description", "xmlns:rtp", JINGLE_RTP_NS)) ||
+ (description = iks_find_with_attrib(content, "pho:description", "xmlns:pho", GOOGLE_PHONE_NS)) ||
(description = iks_find_with_attrib(pak->query, "description", "xmlns", GOOGLE_PHONE_NS)) ||
+ (description = iks_find_with_attrib(pak->query, "pho:description", "xmlns:pho", GOOGLE_PHONE_NS)) ||
(description = iks_find_with_attrib(pak->query, "vid:description", "xmlns", GOOGLE_VIDEO_NS))) {
/* If we failed to do something with the content description abort immediately */
if (jingle_interpret_description(session, description, name, &rtp)) {