Add additional description stanza names from the old Google Talk protocol which is...
authorJoshua Colp <jcolp@digium.com>
Tue, 10 Jul 2012 15:25:12 +0000 (15:25 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 10 Jul 2012 15:25:12 +0000 (15:25 +0000)
(closes issue ASTERISK-20114)
Reported by: Malcolm Davenport

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

channels/chan_motif.c

index 0a816a5..ff39bf1 100644 (file)
@@ -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)) {