[svn-commits] oej: trunk r65894 - in /trunk: ./ channels/chan_gtalk.c

[svn-commits at lists.digium.com]

Author: oej
Date: Thu May 24 10:21:39 2007
New Revision: 65894

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65894
Log:
Merged revisions 65857 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r65857 | oej | 2007-05-24 17:05:10 +0200 (Thu, 24 May 2007) | 2 lines

Issue 7686, fix by phsultan, NAT issues when calling from gtalk to SIP over nat.

........

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

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

Modified: trunk/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_gtalk.c?view=diff&rev=65894&r1=65893&r2=65894
==============================================================================
--- trunk/channels/chan_gtalk.c (original)
+++ trunk/channels/chan_gtalk.c Thu May 24 10:21:39 2007
@@ -527,7 +527,7 @@
 	ast_mutex_lock(&p->lock);
 	if (p->rtp){
 		*rtp = p->rtp;
-		res = AST_RTP_TRY_NATIVE;
+		res = AST_RTP_TRY_PARTIAL;
 	}
 	ast_mutex_unlock(&p->lock);