From: Automerge Script <automerge@asterisk.org>
Date: Wed, 9 May 2007 18:18:21 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.19-netsec~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7afe67bd95e172c7863992fc48bed9d2457c5cac;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@63696 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 3dea1aa5d3..4d8d914407 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -5191,28 +5191,30 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
 		i->subs[index].linear = 0;
 		zt_setlinear(i->subs[index].zfd, i->subs[index].linear);
 		features = 0;
-		if (i->busydetect && CANBUSYDETECT(i)) {
-			features |= DSP_FEATURE_BUSY_DETECT;
-		}
-		if ((i->callprogress & 1) && CANPROGRESSDETECT(i)) {
-			features |= DSP_FEATURE_CALL_PROGRESS;
-		}
-		if ((!i->outgoing && (i->callprogress & 4)) || 
-		    (i->outgoing && (i->callprogress & 2))) {
-			features |= DSP_FEATURE_FAX_DETECT;
-		}
+		if (index == SUB_REAL) {
+			if (i->busydetect && CANBUSYDETECT(i)) {
+				features |= DSP_FEATURE_BUSY_DETECT;
+			}
+			if ((i->callprogress & 1) && CANPROGRESSDETECT(i)) {
+				features |= DSP_FEATURE_CALL_PROGRESS;
+			}
+			if ((!i->outgoing && (i->callprogress & 4)) || 
+			    (i->outgoing && (i->callprogress & 2))) {
+				features |= DSP_FEATURE_FAX_DETECT;
+			}
 #ifdef ZT_TONEDETECT
-		x = ZT_TONEDETECT_ON | ZT_TONEDETECT_MUTE;
-		if (ioctl(i->subs[index].zfd, ZT_TONEDETECT, &x)) {
+			x = ZT_TONEDETECT_ON | ZT_TONEDETECT_MUTE;
+			if (ioctl(i->subs[index].zfd, ZT_TONEDETECT, &x)) {
 #endif		
-			i->hardwaredtmf = 0;
-			features |= DSP_FEATURE_DTMF_DETECT;
+				i->hardwaredtmf = 0;
+				features |= DSP_FEATURE_DTMF_DETECT;
 #ifdef ZT_TONEDETECT
-		} else if (NEED_MFDETECT(i)) {
-			i->hardwaredtmf = 1;
-			features |= DSP_FEATURE_DTMF_DETECT;
-		}
+			} else if (NEED_MFDETECT(i)) {
+				i->hardwaredtmf = 1;
+				features |= DSP_FEATURE_DTMF_DETECT;
+			}
 #endif
+		}
 		if (features) {
 			if (i->dsp) {
 				ast_log(LOG_DEBUG, "Already have a dsp on %s?\n", tmp->name);