[svn-commits] pabelanger: trunk r341437 - in /trunk: ./ channels/chan_gtalk.c

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Wed Oct 19 14:02:09 2011
New Revision: 341437

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=341437
Log:
Outgoing calls with Google Voice

Google has recently make some changes (again) to their protocol.  Rather then
patching asterisk to flip between the two different methods, we now allow both.

Lets hope this keeps Google Voice happy for a while.

(closes issue ASTERISK-18714)
Reported by: Iordan Iordanov
Patches:
    chan_gtalk.patch uploaded by Iordan Iordanov (licenses 6311)
........

Merged revisions 341435 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 341436 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/channels/chan_gtalk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=341437&r1=341436&r2=341437
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Wed Oct 19 14:02:09 2011
@@ -496,7 +496,8 @@
 				break;
 			}
 			if (!strcasecmp(name, "error") &&
-				(redirect = iks_find_cdata(traversenodes, "redirect")) &&
+				((redirect = iks_find_cdata(traversenodes, "redirect")) ||
+				  (redirect = iks_find_cdata(traversenodes, "sta:redirect"))) &&
 				(redirect = strstr(redirect, "xmpp:"))) {
 				redirect += 5;
 				ast_debug(1, "redirect %s\n", redirect);