[svn-commits] file: branch 1.6.1 r181359 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Mar 11 12:29:45 2009
New Revision: 181359

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=181359
Log:
Merged revisions 181345 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r181345 | file | 2009-03-11 14:26:40 -0300 (Wed, 11 Mar 2009) | 21 lines
  
  Merged revisions 181328 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r181328 | file | 2009-03-11 14:22:52 -0300 (Wed, 11 Mar 2009) | 14 lines
    
    Fix issue where an attended transfer could not be completed under a rare scenario.
    
    When completing an attended transfer chan_sip does a check to make sure the extension
    in the URI portion of the Refer-To header is a local valid extension. We don't actually
    need to check this since we know for sure the other channel is already up and talking to
    the extension. Some devices do not put the extension in the Refer-To header either, which
    can cause the extension check to fail. We now no longer do this check if it is an attended
    transfer.
    
    (closes issue #14628)
    Reported by: sverre
    Patches:
          14628.diff uploaded by file (license 11)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=181359&r1=181358&r2=181359
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed Mar 11 12:29:45 2009
@@ -11835,7 +11835,7 @@
 	ast_copy_string(referdata->refer_to_context, transfer_context, sizeof(referdata->refer_to_context));
 	
 	/* Either an existing extension or the parking extension */
-	if (ast_exists_extension(NULL, transfer_context, refer_to, 1, NULL) ) {
+	if (referdata->attendedtransfer || ast_exists_extension(NULL, transfer_context, refer_to, 1, NULL) ) {
 		if (sip_debug_test_pvt(transferer)) {
 			ast_verbose("SIP transfer to extension %s@%s by %s\n", refer_to, transfer_context, referred_by_uri);
 		}