diff options
| author | Terry Wilson <twilson@digium.com> | 2011-07-11 19:49:35 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2011-07-11 19:49:35 +0000 |
| commit | 3b4d9075f6fb1f8317072cbb8c87597b13878206 (patch) | |
| tree | 769e8a24df7d0032961fda42d59bc3a85dab4397 | |
| parent | 881173268c7277db4a5c379d8bbdb0e775c82099 (diff) | |
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
| -rw-r--r-- | channels/chan_gtalk.c | 9 | ||||
| -rw-r--r-- | include/asterisk/jingle.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 3b08d8ce4..326cb69db 100644 --- 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 bbe86c8f2..77820654c 100644 --- 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" |