diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-13 18:27:54 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-10-13 18:27:54 +0000 |
commit | 9ebd430cd31aa8d6e76c75db03d77ce0025637b9 (patch) | |
tree | b5afd966e15542b9db79d321c8bae141fe961d5f /include | |
parent | 5a5fc722ebbfa54d4fc8f8bdb61efb29d0f1f0f6 (diff) |
Fix call timeouts with rtp bridge etc (bug #5252)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6759 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rwxr-xr-x | include/asterisk/channel.h | 2 | ||||
-rwxr-xr-x | include/asterisk/rtp.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 0d7cb6b05..4e6328754 100755 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -145,7 +145,7 @@ struct ast_channel_tech { /*! 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); diff --git a/include/asterisk/rtp.h b/include/asterisk/rtp.h index fd6503c05..a5c3014ea 100755 --- a/include/asterisk/rtp.h +++ b/include/asterisk/rtp.h @@ -148,7 +148,7 @@ char *ast_rtp_lookup_mime_multiple(char *buf, int size, const int capability, co 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); |