Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv4881
Modified Files:
channel.c
Log Message:
Don't wait longer than our timeout for something to happen (bug #4653)
Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- channel.c 3 Aug 2005 04:42:59 -0000 1.229
+++ channel.c 8 Aug 2005 06:54:36 -0000 1.230
@@ -2879,7 +2879,7 @@
/* Copy voice back and forth between the two channels. Give the peer
the ability to transfer calls with '#<extension' syntax. */
struct ast_channel *cs[3];
- int to = -1;
+ int to;
struct ast_frame *f;
struct ast_channel *who = NULL;
void *pvt0, *pvt1;
@@ -2922,8 +2922,10 @@
res = -3;
break;
}
-
- }
+ to = time_left_ms;
+ } else
+ to = -1;
+
who = ast_waitfor_n(cs, 2, &to);
if (!who) {
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
