Merged revisions 327682 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r327682 | twilson | 2011-07-11 12:41:59 -0700 (Mon, 11 Jul 2011) | 9 lines

  Update chan_gtalk to work with changed GMail-based calls

  The messages sent by the GMail client have changed, but include the
  old-style messages as well. This patch checks for this case and
  uses the old-style offer.

  (closes issue ASTERISK-18084)
  Review: https://reviewboard.asterisk.org/r/1312/
........

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

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 3b08d8ce4e9b04b91923b7d7d2363ae80cf8982e..326cb69dba2a215a66ceace14c2f9e08c39517b5 100644 (file)
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -1336,7 +1336,7 @@ static int gtalk_newcall(struct gtalk *client, ikspak *pak)
        ast_copy_string(p->sid, sid, sizeof(p->sid));
 
        /* codec points to the first <payload-type/> tag */
-       codec = iks_first_tag(iks_first_tag(iks_first_tag(pak->x)));
+       codec = iks_first_tag(iks_first_tag(pak->query));
 
        while (codec) {
                char *codec_id = iks_find_attrib(codec, "id");
@@ -2049,6 +2049,12 @@ static int gtalk_parser(void *data, ikspak *pak)
 {
        struct gtalk *client = ASTOBJ_REF((struct gtalk *) data);
        int res;
+       iks *tmp;
+
+       if (!strcasecmp(iks_name(pak->query), "jin:jingle") && (tmp = iks_next(pak->query)) && !strcasecmp(iks_name(tmp), "ses:session")) {
+               ast_debug(1, "New method detected. Skipping jingle offer and using old gtalk method.\n");
+               pak->query = tmp;
+       }
 
        if (!strcmp(S_OR(iks_find_attrib(pak->x, "type"), ""), "error")) {
                ast_log(LOG_NOTICE, "Remote peer reported an error, trying to establish the call anyway\n");
@@ -2233,6 +2239,7 @@ static int gtalk_load_config(void)
                                                ASTOBJ_WRLOCK(member);
                                                member->connection = NULL;
                                                iks_filter_add_rule(iterator->f, gtalk_parser, member, IKS_RULE_TYPE, IKS_PAK_IQ, IKS_RULE_NS, GOOGLE_NS, IKS_RULE_DONE);
+                                               iks_filter_add_rule(iterator->f, gtalk_parser, member, IKS_RULE_TYPE, IKS_PAK_IQ, IKS_RULE_NS, GOOGLE_JINGLE_NS, IKS_RULE_DONE);
                                                iks_filter_add_rule(iterator->f, gtalk_parser, member, IKS_RULE_TYPE, IKS_PAK_IQ, IKS_RULE_NS, "http://jabber.org/protocol/gtalk", IKS_RULE_DONE);
                                                ASTOBJ_UNLOCK(member);
                                                ASTOBJ_UNLOCK(iterator);

diff --git a/include/asterisk/jingle.h b/include/asterisk/jingle.h
index bbe86c8f2842d5d6b8bb4397adcd327a7194292f..77820654cdad4d58ba6621569a5d227f6b1b80ee 100644 (file)
--- a/include/asterisk/jingle.h
+++ b/include/asterisk/jingle.h
@@ -44,6 +44,7 @@
 #define JINGLE_DTMF_NS "urn:xmpp:tmp:jingle:dtmf"
 
 #define GOOGLE_NS "http://www.google.com/session"
+#define GOOGLE_JINGLE_NS "urn:xmpp:jingle:1"
 #define GOOGLE_AUDIO_NS "http://www.google.com/session/phone"
 #define GOOGLE_VIDEO_NS "http://www.google.com/session/video"
 #define GOOGLE_TRANSPORT_NS "http://www.google.com/transport/p2p"