[asterisk-commits] file: branch 1.6.1 r228550 - in /branches/1.6.1: ./ channels/chan_sip.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Nov 6 12:42:03 CST 2009


Author: file
Date: Fri Nov  6 12:41:59 2009
New Revision: 228550

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=228550
Log:
Merged revisions 228548 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r228548 | file | 2009-11-06 14:37:59 -0400 (Fri, 06 Nov 2009) | 11 lines
  
  Merged revisions 228547 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r228547 | file | 2009-11-06 14:32:58 -0400 (Fri, 06 Nov 2009) | 4 lines
    
    Don't overwrite caller ID name on a trunk with the configured fullname when using users.conf
    
    (issue ABE-1989)
  ........
................

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://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=228550&r1=228549&r2=228550
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Fri Nov  6 12:41:59 2009
@@ -22717,6 +22717,9 @@
 				ast_callerid_split(v->value, peer->cid_name, sizeof(peer->cid_name), peer->cid_num, sizeof(peer->cid_num));
 			} else if (!strcasecmp(v->name, "fullname")) {
 				ast_copy_string(peer->cid_name, v->value, sizeof(peer->cid_name));
+			} else if (!strcasecmp(v->name, "trunkname")) {
+				/* This is actually for a trunk, so we don't want to override callerid */
+				ast_copy_string(peer->cid_name, "", sizeof(peer->cid_name));
 			} else if (!strcasecmp(v->name, "cid_number")) {
 				ast_copy_string(peer->cid_num, v->value, sizeof(peer->cid_num));
 			} else if (!strcasecmp(v->name, "context")) {




More information about the asterisk-commits mailing list