kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 02:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

manual update

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@48469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-12-14 13:18:15 +00:00
parent 05f6188c69
commit 32ef26d652
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
channel.c
View File

@@ -39,7 +39,7 @@
#include <zaptel.h>
#endif /* __linux__ */
#ifndef ZT_TIMERPING
#error "You need newer zaptel! Please cvs update zaptel"
#error "You need newer zaptel! Please svn update zaptel"
#endif
#endif
@@ -3351,7 +3351,10 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct
if (bridge_end.tv_sec) {
to = ast_tvdiff_ms(bridge_end, ast_tvnow());
if (to <= 0) {
res = AST_BRIDGE_COMPLETE;
if (config->timelimit)
res = AST_BRIDGE_RETRY;
else
res = AST_BRIDGE_COMPLETE;
break;
}
} else