From: Mark Spencer <markster@digium.com>
Date: Tue, 7 Sep 2004 01:56:18 +0000 (+0000)
Subject: Turn on usecallerid if distinctiveringdetection is on (bug #2389)
X-Git-Tag: 1.0.0~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97904aee0671e43eecf81a78ba80224688708b80;p=thirdparty%2Fasterisk.git

Turn on usecallerid if distinctiveringdetection is on (bug #2389)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3736 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index e9cb8e3162..d6749540c6 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;