aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-09-07 01:56:18 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2004-09-07 01:56:18 +0000
commit41d45345426b7ed2f5255e22a0238d180b8d4e07 (patch)
tree24b2d4ef54cfb729f6abac003dc767526a87dad9
parentda02e2feba82d2c1542fcae67b4f8f6075e15643 (diff)
Turn on usecallerid if distinctiveringdetection is on (bug #2389)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3736 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xchannels/chan_zap.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index e9cb8e316..d6749540c 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -6158,6 +6158,12 @@ static struct zt_pvt *mkintf(int channel, int signalling, int radio, struct zt_p
tmp->restrictcid = restrictcid;
tmp->use_callingpres = use_callingpres;
tmp->priindication_oob = priindication_oob;
+ if (tmp->usedistinctiveringdetection) {
+ if (!tmp->use_callerid) {
+ ast_log(LOG_NOTICE, "Distinctive Ring detect requires 'usecallerid' be on\n");
+ tmp->use_callerid = 1;
+ }
+ }
strncpy(tmp->accountcode, accountcode, sizeof(tmp->accountcode)-1);
tmp->amaflags = amaflags;