kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 02:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,569 Commits 150 Branches 1,601 Tags
ce99e9d9554e2c00b5a6aad970c8f2fa75052bf2
Commit Graph

106 Commits

Author SHA1 Message Date
Joshua Colp
7e22d574a7 Send an unhold indication when going off hold. (issue #10036 reported by speedy) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@71124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-22 16:02:40 +00:00
Joshua Colp
234b7d22fe Add parked call extension AFTER the parking slot has been announced, otherwise two threads will try to handle the same channel and it will go kaboom. (issue #9191 reported by japple) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@69846 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-19 12:57:55 +00:00
Russell Bryant
c8a90488d6 Remove an unnecessary check that makes it so if you hang up after doing an 
attended transfer before the target extension answers the channel, the transfer
is not successful.  (issue #9338, patch by svanlund)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@62547 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-05-01 21:55:19 +00:00
Joshua Colp
84a751aecd Return previous behavior. ParkedCalls will be able to do DTMF based transfers again. trunk however will get an option to allow this to be set on/off. (issue #8804 reported by nortex) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@51145 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-01-16 17:36:50 +00:00
Joshua Colp
efe92601c5 Do not listen for DTMF on the bridge that comes into existence when ParkedCall is executed. This means native bridging can now occur for this. (issue #8406 reported by kebl0155) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@48154 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-30 19:04:11 +00:00
Joshua Colp
6180390206 Remember the pointer to the allocated block of memory so that we can free it and not cause a memory leak. (issue #8449 reported by arkadia) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@48146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-30 18:17:54 +00:00
Joshua Colp
87803a8ac6 Put in missing \ns on the end of ast_logs (issue #7936 reported by wojtekka) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@43924 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-09-28 18:00:30 +00:00
Russell Bryant
0d9ea31f3a 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/branches/1.2@43778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-09-27 16:54:30 +00:00
Kevin P. Fleming
4f3b40fe79 ensure that the 'feature digit timeout' value is taken into account when deciding how long the bridge should run (this fixes a problem report where a digit press that did not invoke a feature is never passed across the bridge) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@38686 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-08-01 23:07:06 +00:00
Joshua Colp
f41b9baed4 Add missing code to bring transferee channel out of MOH/autoservice under certain circumstance (issue #7611 reported by guillecabeza with minor mods by myself) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@38585 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-07-31 17:09:10 +00:00
Kevin P. Fleming
75ca02dbaa backport some mutex initialization and linked list handling fixes from trunk 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@29732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-23 17:15:23 +00:00
BJ Weschke
f1c97e7df8 Fix a potential leak and correct (hopefully) a segfault under certain conditions. #6784 (vovan and perry testing) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@29696 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-23 15:58:24 +00:00
Joshua Colp
7018a80e91 Use the correct language when playing the transfer sound (issue #7109 reported by casper) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@29512 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-22 20:15:04 +00:00
BJ Weschke
1795ff12cd When an application that is executed via applicationmap and exits non-zero, make sure that we pass through the correct return value from the application to make sure a segfault doesn't occur by a bridge trying to continue when it should not. Also, when executing applications via applicationmap, make sure that the application is executed against the channel whose DTMF caused it to be fired off in the first place. (part 1/2 of #7090 - this is the only fix that will be applied to both 1.2 and /trunk) acunningham and blitzrage on testing... 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@29196 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-21 15:16:59 +00:00
Joshua Colp
72fe69919c Incorrect log statement when playing transfer sounds (issue #7008 reported and fixed by nathan) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@25442 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-05-08 11:16:10 +00:00
BJ Weschke
4a40420978 Don't say that we can pass an 'exten' argument in the documentation of Park() when we really cannot. #6902 (opsys) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@18866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-04-10 17:29:51 +00:00
Olle Johansson
b97c1529fc Set initial value on adsipark 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@16346 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-03-30 01:34:53 +00:00
Joshua Colp
0a0470ad00 Issue #6764 - Return BUSY signal when other party is busy at Attended Transfer (Reported by mnachev) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@14523 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-03-23 21:51:50 +00:00
Russell Bryant
0cfcb22bbc fix crash when using the ParkAndAnnounce application. When using this application, 
there will be no peer channel to play the parking announcement to. (issue #6756)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@13961 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-03-21 18:21:47 +00:00
Matthew Fredrickson
4efe647169 Backport of fix for #6094 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@8134 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-01-17 18:29:57 +00:00
Tilghman Lesher
6056391a78 Bug 6081 - fix for memory leak, formatting fixes 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7823 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-01-05 23:07:08 +00:00
Olle Johansson
3821e18d08 Fix copyright of changed file 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-01-05 09:13:21 +00:00
Olle Johansson
66f484defe Issue #5980: Removing extra CR+LF in manager events - needs port to trunk 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7795 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-01-04 21:46:40 +00:00
Kevin P. Fleming
a563eab49a remove extraneous svn:executable properties 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@7221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-29 18:24:39 +00:00
Kevin P. Fleming
608d63ac54 issue #5703 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-10 23:26:40 +00:00
Kevin P. Fleming
33c15f19fe issue #5601 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7035 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-09 00:16:08 +00:00
Kevin P. Fleming
ebf04fc570 more header include simplification 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-08 04:02:35 +00:00
Kevin P. Fleming
a0a9769616 issue #5648 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-08 01:55:31 +00:00
Russell Bryant
7d4a5abb1d Convert some built-in applications to use new args parsing macros. 
Change ast_cdr_reset to take a pointer to an ast_flags structure instead of an integer for flags.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6987 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-06 21:00:35 +00:00
Kevin P. Fleming
980887f8eb minor cleanup 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6956 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-03 21:48:39 +00:00
Kevin P. Fleming
ddaed942ee issue #5499 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-11-01 20:29:36 +00:00
Russell Bryant
3453e3efa5 Doxygen documentation update from oej (issue #5505) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6847 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-10-24 20:12:06 +00:00
Kevin P. Fleming
ba7386ebed ensure that parking context/extension (and other settings) are properly updated on reload (issue #5401) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-10-13 23:58:33 +00:00
Mark Spencer
ea215f5b7d Remove possibility of manager deadlocks from manager actions 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6687 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-09-28 23:10:14 +00:00
Kevin P. Fleming
5da915dcfd update MANY more files with proper copyright/license info (thanks Ian!) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-09-14 20:46:50 +00:00
Kevin P. Fleming
9a4c8f8c9c enable DTMF monitoring when DYNAMIC_FEATURES are specified for a brige (issue #5153) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-09-07 21:36:30 +00:00
Kevin P. Fleming
1e854ea773 remove useless buffer initializations (issue #5134) 
convert pbx_dundi to use ast_copy_string) (issue #5134)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-09-07 21:01:31 +00:00
Kevin P. Fleming
40c5fa88a4 eliminate signedness warnings (issue #5129) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6530 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-09-07 18:55:03 +00:00
Kevin P. Fleming
98563fdb73 formatting fixes and compile fix for FreeBSD (issue #5004) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6381 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-08-23 15:33:27 +00:00
Kevin P. Fleming
3442368b28 ensure that features are not duplicated during reload (issue #3764, take two) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-08-23 14:40:03 +00:00
Kevin P. Fleming
9e9f3ace21 add ability to map feature sequences to applications (issue #3764) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-08-23 02:22:33 +00:00
Russell Bryant
99d6c05f13 more pointer signedness fixes for gcc4 warnings 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-08-08 01:16:44 +00:00
Mark Spencer
8712d1d7f1 Fix timestamp issue with features (bug #4760 with mods) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6268 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-08-03 04:42:59 +00:00
Russell Bryant
eeb34ffd63 more formatting fixes! (bug #4780) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6191 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-07-25 17:31:53 +00:00
Kevin P. Fleming
22b0f5d306 add a library of timeval manipulation functions, and change a large number of usses to use the new functions (bug #4504) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-07-15 23:00:47 +00:00
Kevin P. Fleming
eb397f08df reverse arguments to ast_tvdiff_ms, so they match the 'raw' math being used between the arguments 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-07-11 20:46:25 +00:00
Russell Bryant
5df2640539 use AST_MAX_CONTEXT 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6079 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-07-10 23:58:33 +00:00
Kevin P. Fleming
f268ea2b3c make CLI output use singular/plural when appropriate (bug #4654) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6047 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-07-07 22:32:20 +00:00
Kevin P. Fleming
061caa34c1 support cancellation of attended transfers using the defined disconnect code (bug #3729 with minor mods) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5991 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-06-23 22:12:01 +00:00
Kevin P. Fleming
2b8338cb52 more file version tags 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2005-06-06 22:12:19 +00:00