[asterisk-commits] rmudgett: trunk r357096 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Feb 27 17:42:12 2012
New Revision: 357096

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=357096
Log:
Fix callerid of Originated calls.

Thanks to Matt Riddell for tracking this down.

(closes issue ASTERISK-19385)
Reported by: ornix
........

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

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

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

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

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=357096&r1=357095&r2=357096
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Feb 27 17:42:12 2012
@@ -5371,6 +5371,16 @@
 		}
 	}
 
+	/*
+	 * I seems strange to set the CallerID on an outgoing call leg
+	 * to whom we are calling, but this function's callers are doing
+	 * various Originate methods.  This call leg goes to the local
+	 * user.  Once the local user answers, the dialplan needs to be
+	 * able to access the CallerID from the CALLERID function as if
+	 * the local user had placed this call.
+	 */
+	ast_set_callerid(chan, cid_num, cid_name, cid_num);
+
 	ast_set_flag(ast_channel_cdr(chan), AST_CDR_FLAG_ORIGINATED);
 	ast_party_connected_line_set_init(&connected, &chan->connected);
 	if (cid_num) {