You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Russell Bryant d2c57c5f4f Merged revisions 43779 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r43779 | russell | 2006-09-27 12:55:49 -0400 (Wed, 27 Sep 2006) | 50 lines Merged revisions 43778 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r43778 | russell | 2006-09-27 12:54:30 -0400 (Wed, 27 Sep 2006) | 42 lines Fix a problem that occurred if a user entered a digit that matched a bridge feature that was configured using multiple digits, and the digit that was pressed timed out in the feature digit timeout period. For example, if blind transfer is configured as '##', and a user presses just '#'. In this situation, the call would lock up and no longer pass any frames. (issue #7977 reported by festr, and issue #7982 reported by michaels and valuable input provided by mneuhauser and kuj. Fixed by me, with testing help and peer review from Joshua Colp). There are a couple of issues involved in this fix: 1) When ast_generic_bridge determines that there has been a timeout, it returned AST_BRIDGE_RETRY. Then, when ast_channel_bridge gets this result, it calls ast_generic_bridge over again with the same timestamp for the next event. This results in an endless loop of nothing until the call is terminated. This is resolved by simply changing ast_generic_bridge to return AST_BRIDGE_COMPLETE when it sees a timeout. 2) I also changed ast_channel_bridge such that if in the process of calculating the time until the next event, it knows a timeout has already occured, to immediately return AST_BRIDGE_COMPLETE instead of attempting to bridge the channels anyway. 3) In the process of testing the previous two changes, I ran into a problem in res_features where ast_channel_bridge would return because it determined that there was a timeout. However, ast_bridge_call in res_features would then determine by its own calculation that there was still 1 ms before the timeout really occurs. It would then proceed, and since the bridge broke out and did *not* return a frame, it interpreted this as the call was over and hung up the channels. The reason for this was because ast_bridge_call in res_features and ast_channel_bridge in channel.c were using different times for their calculations. channel.c uses the start_time on the bridge config, which is the time that the feature digit was recieved. However, res_features had another time, 'start', which was set right before calling ast_channel_bridge. 'start' will always be slightly after start_time in the bridge config, and sometimes enough to round up to one ms. This is fixed by making ast_bridge_call use the same time as ast_channel_bridge for the timeout calculation. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43780 65c4cc65-6c06-0410-ace0-fbb531ad65f3		20 years ago
..
snmp	…
Makefile	…
res_adsi.c	move ADSI functionality into ast_ namespace	20 years ago
res_agi.c	Lots more removal of deprecated things	20 years ago
res_clioriginate.c	merge qwell's CLI verbification work	20 years ago
res_config_odbc.c	move ODBC API into ast_ namespace	20 years ago
res_config_pgsql.c	Magical eightball says warnings be gone.	20 years ago
res_convert.c	Lots more removal of deprecated things	20 years ago
res_crypto.c	Lots more removal of deprecated things	20 years ago
res_features.c	Merged revisions 43779 via svnmerge from	20 years ago
res_indications.c	Lots more removal of deprecated things	20 years ago
res_jabber.c	Merged revisions 43466 via svnmerge from	20 years ago
res_limit.c	These three are not defined on all platforms that we support	20 years ago
res_monitor.c	these functions never should have been non-static or in a header file	20 years ago
res_musiconhold.c	Lots more removal of deprecated things	20 years ago
res_odbc.c	Merged revisions 43464 via svnmerge from	20 years ago
res_realtime.c	Remove deprecated apps and funcs	20 years ago
res_smdi.c	everything that loads a config that needs a config file to run	20 years ago
res_snmp.c	everything that loads a config that needs a config file to run	20 years ago
res_speech.c	…