[asterisk-commits] trunk r13238 - in /trunk: ./ channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Mar 16 11:46:15 2006
New Revision: 13238

URL: http://svn.digium.com/view/asterisk?rev=13238&view=rev
Log:
Merged revisions 13237 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r13237 | russell | 2006-03-16 12:42:46 -0500 (Thu, 16 Mar 2006) | 3 lines

always use the callerid signalling method set in the zt_pvt strucutre as
opposed to the last one read from the config file (issue #6734, with mods)

........

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

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

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?rev=13238&r1=13237&r2=13238&view=diff
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Thu Mar 16 11:46:15 2006
@@ -6017,7 +6017,6 @@
 					number = 0;
 			/* If set to use V23 Signalling, launch our FSK gubbins and listen for it */
 			} else if ((p->cid_signalling == CID_SIG_V23) || (p->cid_signalling == CID_SIG_V23_JP)) {
-
 				cs = callerid_new(p->cid_signalling);
 				if (cs) {
 					samples = 0;
@@ -6212,7 +6211,7 @@
 			}
 		} else if (p->use_callerid && p->cid_start == CID_START_RING) {
 			/* FSK Bell202 callerID */
-			cs = callerid_new(cid_signalling);
+			cs = callerid_new(p->cid_signalling);
 			if (cs) {
 #if 1
 				bump_gains(p);