diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-16 17:42:46 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-16 17:42:46 +0000 |
| commit | 77a91922cc6031351a42b9f24453d01da74e5968 (patch) | |
| tree | 7110302ab3b81743c2be4b78ba87f6f60667c6f4 /channels/chan_zap.c | |
| parent | a48ecc6d4b4b3899e8611422a53695ac8706e0bf (diff) | |
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/branches/1.2@13237 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 0a4f21b8e..e584a0a67 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -5856,7 +5856,7 @@ static void *ss_thread(void *data) number = 0; /* If set to use V23 Signalling, launch our FSK gubbins and listen for it */ } else if (p->cid_signalling == CID_SIG_V23) { - cs = callerid_new(cid_signalling); + cs = callerid_new(p->cid_signalling); if (cs) { samples = 0; #if 1 @@ -6027,7 +6027,7 @@ static void *ss_thread(void *data) } } 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); |