[Asterisk-cvs] asterisk/include/asterisk channel.h, 1.103, 1.104 rtp.h, 1.25, 1.26

[markster]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv20883/include/asterisk

Modified Files:
	channel.h rtp.h 
Log Message:
Fix call timeouts with rtp bridge etc (bug #5252)


Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- channel.h	4 Oct 2005 23:28:57 -0000	1.103
+++ channel.h	13 Oct 2005 18:27:53 -0000	1.104
@@ -145,7 +145,7 @@
 
 	/*! Bridge two channels of the same type together */
 	enum ast_bridge_result (* const bridge)(struct ast_channel *c0, struct ast_channel *c1, int flags,
-						struct ast_frame **fo, struct ast_channel **rc);
+						struct ast_frame **fo, struct ast_channel **rc, int timeoutms);
 
 	/*! Indicate a particular condition (e.g. AST_CONTROL_BUSY or AST_CONTROL_RINGING or AST_CONTROL_CONGESTION */
 	int (* const indicate)(struct ast_channel *c, int condition);

Index: rtp.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/rtp.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- rtp.h	12 Oct 2005 20:45:18 -0000	1.25
+++ rtp.h	13 Oct 2005 18:27:54 -0000	1.26
@@ -148,7 +148,7 @@
 
 void ast_rtp_setnat(struct ast_rtp *rtp, int nat);
 
-int ast_rtp_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc);
+int ast_rtp_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc, int timeoutms);
 
 int ast_rtp_proto_register(struct ast_rtp_protocol *proto);