[svn-commits] sruffell: branch sruffell/voicebus r3947 - /team/sruffell/voicebus/kernel/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Wed Mar  5 18:00:12 2008
New Revision: 3947

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3947
Log:
MF tones would have never been generated since the check was within the block
that check if the tone was within the DTMF range.

Modified:
    team/sruffell/voicebus/kernel/zaptel-base.c

Modified: team/sruffell/voicebus/kernel/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/team/sruffell/voicebus/kernel/zaptel-base.c?view=diff&rev=3947&r1=3946&r2=3947
==============================================================================
--- team/sruffell/voicebus/kernel/zaptel-base.c (original)
+++ team/sruffell/voicebus/kernel/zaptel-base.c Wed Mar  5 18:00:12 2008
@@ -1164,12 +1164,16 @@
 		res = 0;
 		if (chan->digitmode == DIGIT_MODE_DTMF) {
 			chan->curtone = &chan->curzone->dtmf_continuous[tone - ZT_TONE_DTMF_BASE];
-		} else if (chan->digitmode == DIGIT_MODE_MFV1) {
+		} 
+	} else if ((tone >= ZT_TONE_MF_BASE) && (tone <= ZT_TONE_MF_MAX)) {
+		chan->dialing = 1;
+		res = 0;
+		if (chan->digitmode == DIGIT_MODE_MFV1) {
 			chan->curtone = &chan->curzone->mf_continuous[tone - ZT_TONE_MF_BASE];
-		} else {
-			chan->dialing = 0;
-			res = -EINVAL;
-		}
+		}
+	} else {
+		chan->dialing = 0;
+		res = -EINVAL;
 	}
 
 	if (chan->curtone)