diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-03-16 17:46:15 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-03-16 17:46:15 +0000 |
| commit | 4c49c78e2e0c66628b5fc106b3ea922ba287ab4b (patch) | |
| tree | 72d21c843ad8e45508285f9bd2ad75d06f5ec546 /channels/chan_zap.c | |
| parent | 1bad8015955234c6e6425d9af1b5a21f3cde301b (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@13238 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 77edf01d2..30c1bef4f 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -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); |