dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@13238 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
russell 2006-03-16 17:46:15 +00:00
parent fa45d34baf
commit 100452677b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
channels/chan_zap.c
View File

@ -6017,7 +6017,6 @@ lax);
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 @@ lax);
}
} 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);