diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-07-22 16:44:20 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-07-22 16:44:20 +0200 |
| commit | 2b9be10b177024bd663bd5fce19ea0fb76260c27 (patch) | |
| tree | f6c296350683ee94c120213bef57e14fd153b23a /channels/chan_gtalk.c | |
| parent | 916e420bf0c8db7a8cb1f60557cd2807652142cf (diff) | |
| parent | 28da2a199d7e1624ac56ccb27d3671117f4e2717 (diff) | |
Diffstat (limited to 'channels/chan_gtalk.c')
| -rw-r--r-- | channels/chan_gtalk.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 3b08d8ce4..a15fca975 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -35,6 +35,7 @@ <depend>iksemel</depend> <depend>res_jabber</depend> <use type="external">openssl</use> + <support_level>extended</support_level> ***/ #include "asterisk.h" @@ -1336,7 +1337,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 +2050,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 +2240,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); |