diff options
| author | phsultan <phsultan@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-23 11:02:21 +0000 |
|---|---|---|
| committer | phsultan <phsultan@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-23 11:02:21 +0000 |
| commit | 3e7f8750f1c22da79cf7ede176935b1d448b675a (patch) | |
| tree | 2eefb6effd1dab9591c4f590666508de269efb77 /channels/chan_gtalk.c | |
| parent | 8be0af63ee684227f84827332d9c535c7972499c (diff) | |
Merged revisions 118020 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r118020 | phsultan | 2008-05-23 12:33:21 +0200 (Fri, 23 May 2008) | 15 lines
- remove whitespaces between tags in received XML packets before giving
them to the parser ;
- report Gtalk error messages from a buddy to the console.
This patch makes Asterisk "Google Jingle" (chan_gtalk) implementation
work with Empathy. Note that this is only true for audio streams, not
video.
Thank you to PH for his great help!
(closes issue #12647)
Reported by: PH
Patches:
trunk-12647-1.diff uploaded by phsultan (license 73)
Tested by: phsultan, PH
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@118021 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_gtalk.c')
| -rw-r--r-- | channels/chan_gtalk.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index d8e8c819d..ab044cb9b 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -1699,7 +1699,10 @@ static int gtalk_parser(void *data, ikspak *pak) { struct gtalk *client = ASTOBJ_REF((struct gtalk *) data); - if (iks_find_with_attrib(pak->x, "session", "type", "initiate")) { + if (iks_find_attrib(pak->x, "type") && !strcmp(iks_find_attrib (pak->x, "type"),"error")) { + ast_log(LOG_NOTICE, "Remote peer reported an error, trying to establish the call anyway\n"); + } + else if (iks_find_with_attrib(pak->x, "session", "type", "initiate")) { /* New call */ gtalk_newcall(client, pak); } else if (iks_find_with_attrib(pak->x, "session", "type", "candidates") || iks_find_with_attrib(pak->x, "session", "type", "transport-info")) { |