[asterisk-commits] jpeeler: branch 1.8 r281429 - in /branches/1.8: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Mon Aug  9 15:43:54 2010
New Revision: 281429

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=281429
Log:
Merged revisions 281391 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r281391 | jpeeler | 2010-08-09 15:07:29 -0500 (Mon, 09 Aug 2010) | 20 lines
  
  Merged revisions 281390 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r281390 | jpeeler | 2010-08-09 15:04:30 -0500 (Mon, 09 Aug 2010) | 13 lines
    
    Prevent loss of Caller ID information set on local channel after masquerade.
    
    Caller ID set on the channel before a masquerade occurs when using a local
    channel would cause the information to be lost. The problem was that the
    information was set on a channel destined to be hung up. The somewhat confusing
    fix is to detect if any Caller ID has been set on the channel and if so 
    preswap the Caller ID data so that basically the masquerade puts the data back.
    
    (closes issue #17138)
    Reported by: kobaz
    
    Review: https://reviewboard.asterisk.org/r/847/
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/channels/chan_local.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Mon Aug  9 15:43:54 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671,280739,280983,281051
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671,280739,280983,281051,281391

Modified: branches/1.8/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_local.c?view=diff&rev=281429&r1=281428&r2=281429
==============================================================================
--- branches/1.8/channels/chan_local.c (original)
+++ branches/1.8/channels/chan_local.c Mon Aug  9 15:43:54 2010
@@ -409,6 +409,23 @@
 							p->chan->audiohooks = p->owner->audiohooks;
 							p->owner->audiohooks = audiohooks_swapper;
 						}
+
+						/* If any Caller ID was set, preserve it after masquerade like above. We must check
+						 * to see if Caller ID was set because otherwise we'll mistakingly copy info not
+						 * set from the dialplan and will overwrite the real channel Caller ID. The reason
+						 * for this whole preswapping action is because the Caller ID is set on the channel
+						 * thread (which is the to be masqueraded away local channel) before both local
+						 * channels are optimized away.
+						 */
+						if (p->owner->caller.id.name.valid || p->owner->caller.id.number.valid ||
+							p->owner->caller.id.subaddress.valid) {
+
+							struct ast_party_caller tmp;
+							tmp = p->owner->caller;
+							p->owner->caller = p->chan->_bridge->caller;
+							p->chan->_bridge->caller = tmp;
+						}
+
 						ast_app_group_update(p->chan, p->owner);
 						ast_channel_masquerade(p->owner, p->chan->_bridge);
 						ast_set_flag(p, LOCAL_ALREADY_MASQED);