[asterisk-commits] mmichelson: branch mmichelson/timeout_fixes r374074 - /team/mmichelson/timeou...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Sep 28 17:02:46 2012
New Revision: 374074

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374074
Log:
More fixes of bad logic.


Modified:
    team/mmichelson/timeout_fixes/channels/chan_dahdi.c

Modified: team/mmichelson/timeout_fixes/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/timeout_fixes/channels/chan_dahdi.c?view=diff&rev=374074&r1=374073&r2=374074
==============================================================================
--- team/mmichelson/timeout_fixes/channels/chan_dahdi.c (original)
+++ team/mmichelson/timeout_fixes/channels/chan_dahdi.c Fri Sep 28 17:02:46 2012
@@ -6056,12 +6056,12 @@
 		res = ast_waitfor(chan, timeout);
 		if (res < 0) {
 			ast_log(LOG_DEBUG, "ast_waitfor failed on channel %s, going out ...\n", chan->name);
-			res = -1;
 			break;
 		}
 		if (res == 0) {
 			continue;
 		}
+		res = 0;
 		f = ast_read(chan);
 		if (!f) {
 			ast_log(LOG_DEBUG, "No frame read on channel %s, going out ...\n", chan->name);
@@ -10539,7 +10539,7 @@
 							dtmfbuf[k++] = f->subclass.integer;
 						}
 						ast_debug(1, "CID got digit '%c'\n", f->subclass.integer);
-						res = 4000;/* This is a typical OFF time between rings. */
+						start = ast_tvnow();
 					}
 					ast_frfree(f);
 					if (chan->_state == AST_STATE_RING ||
@@ -10800,7 +10800,7 @@
 					if (f->frametype == AST_FRAME_DTMF) {
 						dtmfbuf[k++] = f->subclass.integer;
 						ast_log(LOG_DEBUG, "CID got digit '%c'\n", f->subclass.integer);
-						res = 2000;
+						start = ast_tvnow();
 					}
 					ast_frfree(f);