[zaptel-commits] mattf: branch 1.4 r3779 - /branches/1.4/zaptel-base.c

[SVN commits to the Zaptel project]

Author: mattf
Date: Fri Feb  1 14:10:28 2008
New Revision: 3779

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3779
Log:
Assume if we're disabling echo can that there are no paramters passed

Modified:
    branches/1.4/zaptel-base.c

Modified: branches/1.4/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/zaptel-base.c?view=diff&rev=3779&r1=3778&r2=3779
==============================================================================
--- branches/1.4/zaptel-base.c (original)
+++ branches/1.4/zaptel-base.c Fri Feb  1 14:10:28 2008
@@ -4363,8 +4363,17 @@
 		chan->echolastupdate = 0;
 		chan->echotimer = 0;
 		spin_unlock_irqrestore(&chan->lock, flags);
-		if (chan->span && chan->span->echocan)
-			chan->span->echocan(chan, 0);
+
+		/* Make sure this is zero if we're disabling echo can */
+		ecp->param_count = 0;
+
+		if (chan->span) {
+			if (chan->span->echocan_with_params)
+				chan->span->echocan_with_params(chan, ecp, NULL);
+			else if (chan->span->echocan)
+				chan->span->echocan(chan, 0);
+		}
+		
 		if (tec)
 			echo_can_free(tec);