kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-24 06:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,156 Commits 150 Branches 1,597 Tags
f8c69c7d921e44173f89156adb0e911c48a3daba
Commit Graph

209 Commits

Author SHA1 Message Date
Russell Bryant
9b53acdbf5 Fix a crash in ast_masq_park_call() 
(issue #11342)
Reported by: DEA
Patches:
      res_features-park.txt uploaded by DEA (license 3)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@100626 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-01-28 18:26:31 +00:00
Olle Johansson
48066f4cfd Add more dependencies on chan_local and add a note to the description of chan_local 
so that people don't disable it in menuselect just to clean up.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99594 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-01-22 17:41:57 +00:00
Terry Wilson
eab2f166c3 This should at least temporarily fix a problem where the 't' Dial 
option is incorrectly passed to the transferee when built-in
attended transfers are used.  There is still a problem with 'T',
but better to fix some problems than no problems while we work
on it.

(closes issue #7904)
Reported by: k-egg
Patches: 
      transfer-fix-b14-r97657.diff uploaded by sergee (license 138)
Tested by: sergee, otherwiseguy


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-01-18 17:13:00 +00:00
Russell Bryant
eebd74ee97 Fix saying the parking space number to the caller doing the parking ... 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-01-09 18:02:08 +00:00
Jason Parker
6cc0887f56 Properly continue in the dialplan if using PARKINGEXTEN and the slot is full. 
Issue 11237, patch by me.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@96573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-01-04 22:55:56 +00:00
Russell Bryant
39c5c66235 Don't try to send a parked call back to itself. 
(closes issue #11622, reported by djrodman, patched by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@94793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-12-26 17:24:17 +00:00
Russell Bryant
f4bb168b66 resolve compiler warning 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@92556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-12-12 19:40:02 +00:00
Mark Michelson
097b9dc2cf Correctly detect where a dynamic feature was activated. Before this patch, 
the channel which initiated the bridge was always assumed to have been the one
which activated the dynamic feature. This patch corrects this.

(closes issue #11529, reported and patched by nic_bellamy)



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@92510 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-12-12 17:46:14 +00:00
Jason Parker
8579b0ff93 Fix crash in ParkAndAnnounce application. 
Issue #11436, reported by lytledd, patch by eliel.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@90607 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-12-03 20:51:17 +00:00
Joshua Colp
4ac8f69d0a Add module counting removal for error conditions. 
(closes issue #11333)
Reported by: Laureano
Patches:
      res_features_v2.c.patch uploaded by Laureano (license 265)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@89599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-11-26 18:02:56 +00:00
Terry Wilson
9c29d80d70 If a channel gets masqueraded in the middle of a park, don't play the 
announcement to the masqueraded channel, and dial back to the original
channel on timeout.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@89491 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-11-21 18:59:27 +00:00
Joshua Colp
34a3095877 Print out the correct filename (features.conf) in the log message when parkpos options are incorrect. 
(closes issue #11295)
Reported by: Laureano
Patches:
      res_features.c.patch uploaded by Laureano (license 265)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@89419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-11-19 15:53:32 +00:00
Jason Parker
b0e9d400ff Revert change from revision 67064. 
It is documented behavior that if a parking extension already exists while using PARKINGEXTEN,
 dialplan execution will continue.  If blind transferring to a Park with PARKINGEXTEN, you
 must keep this in mind, and handle the failure yourself.

Issue 11237, reported by jon.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@89248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-11-13 19:47:45 +00:00
Joshua Colp
8f4659cc89 Add two more checks before printing out a warning message about bridging. If either channel has hungup of course the bridge will have failed. 
(closes issue #10009)
Reported by: dimas


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@87571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-10-30 16:13:39 +00:00
Jason Parker
ede010d0d0 Fix some odd formatting I missed.. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@84437 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-10-02 19:01:59 +00:00
Jason Parker
01480eb1fb Finish up on transferee channel before return on failure. 
Issue 10821, patch by Ivan


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@84410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-10-02 18:52:55 +00:00
Russell Bryant
db99815a6a Handle the case where there are multiple dynamic features with the same digit 
mapping, but won't always match the activated on/by access controls.  In that
case, the code needs to keep trying features for a match.
(reported by Atis on the asterisk-dev list, patched by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@82594 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-09-17 16:46:59 +00:00
Mark Michelson
2a3b64bf70 Fixes a memory leak 
(closes issue #10658, reported and patched by Ivan)



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-09-06 15:20:36 +00:00
Russell Bryant
aa3b7e22f5 Fix an issue that can occur when you do an attended transfer to parking. If 
you complete the transfer before the announcement of the parking spot finishes,
then the channel being parked will hear the remainder of the announcement.
These changes make it so that will not happen anymore.

Basically, res_features sets a flag on the channel is playing the announcement
to so that the file streaming core knows that it needs to watch out for a
channel masquerade, and if it occurs, to abort the announcement.

(closes BE-182)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-09-05 20:53:41 +00:00
Joshua Colp
85bf0ee987 (closes issue #10618) 
Reported by: dimas
Don't pass through the stopped sounds frame.... just drop it.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81403 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-08-31 14:38:59 +00:00
Joshua Colp
279d96a974 (closes issue #10009) 
Reported by: dimas
Don't output a bridge failed warning message if it failed because one of the channels was part of the masquerade process. That is perfectly normal.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81401 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-08-30 23:53:41 +00:00
Joshua Colp
a47dcc167c (issue #10599) 
Reported by: dimas
Handle the -1 control subclass during feature dialing (it indicates to stop sounds).


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@81369 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-08-30 14:23:40 +00:00
Russell Bryant
ed6d4ec72c When executing a dynamic feature, don't look it up a second time by digit pattern 
after we already looked it up by name.  This causes broken behavior if there is
more than one feature defined with the same digit pattern.
(closes issue #10539, reported by bungalow, patch by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@80573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-08-23 20:16:41 +00:00
Joshua Colp
784d5f32c0 (closes issue #10415) 
Reported by: atis
Revert fix for #10327 as it causes more issues then it solves.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@79397 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-08-14 15:27:13 +00:00
Joshua Colp
cd53ad9161 (closes issue #10327) 
Reported by: kkiely
Instead of directly mucking with the extension/context/priority of the channel we are transferring when it has a PBX simply call ast_async_goto on it. This will ensure that the channel gets handled properly and sent to the right place.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@77778 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-07-30 17:11:02 +00:00
Russell Bryant
6a2ab6b475 Pass HOLD and UNHOLD frames to the other channel when they are returned from a 
native bridge function.  This fixes a problem where when two zap channels are
natively bridged and one does a flash hook, the other channel did not receive
music on hold.  (Reported to me directly by Doug Bailey at Digium)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@73512 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-07-05 20:50:08 +00:00
Tilghman Lesher
f02d20405b Issue 10044 - chan->cdr is NULL here, so peer->cdr is what we really wanted to use 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@71291 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-24 17:50:24 +00:00
Steve Murphy
6f6ffbb5c5 This patch is meant to fix 8433; where clid and src are lost via bridging. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@71230 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-23 03:29:48 +00:00
Joshua Colp
bba22a6876 Merged revisions 69846 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r69846 | file | 2007-06-19 08:57:55 -0400 (Tue, 19 Jun 2007) | 2 lines

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.4@69847 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-19 13:00:57 +00:00
Russell Bryant
1f9898d8bd Fix a silly deadlock in res_features that I found while debugging on one of 
blitzrage's test machines.  It was one of the situations where he was seeing
hung channels, and may be the cause of some of the reports from other people.
(related to issue #9235)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@69579 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-15 20:18:58 +00:00
Joshua Colp
26038a4b77 Returning a value that indicates the parking of a call was a success when it really wasn't (because the parking slot selected was in use) is the wrong thing to do. (issue #9723 reported by mdu113) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@67064 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-06-04 17:41:59 +00:00
Russell Bryant
69cd2cb213 Properly fix a problem that occurs when you set PARKINGEXTEN to an exten where 
a call is already parked.  (issue #9723, patch by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@64426 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-05-15 19:52:18 +00:00
Russell Bryant
39ebbfe69d When someone requests a specific parking space using the PARKINGEXTEN variable, 
ensure that no other caller is already there.
(issue #9723, reported by mdu113, patch by me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@64353 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-05-14 21:16:39 +00:00
Joshua Colp
438335c9a7 Make the PARKINGEXTEN feature of parking actually work. (issue #9708 reported by mdu113) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@63872 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-05-11 15:43:14 +00:00
Russell Bryant
1fb11df91a I mixed up the use of the find_feature() function, so I renamed it 
find_dynamic_feature, and changed the code to use the correct lock when
using it.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@63448 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-05-08 16:53:09 +00:00
Russell Bryant
fd993ffd7d Use a read/write lock when accessing the built-in features. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@63445 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-05-08 16:30:43 +00:00
Russell Bryant
6e13855338 Merged revisions 62547 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r62547 | russell | 2007-05-01 16:55:19 -0500 (Tue, 01 May 2007) | 4 lines

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.4@62548 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-05-01 21:57:10 +00:00
Steve Murphy
18ad368048 Finished up a previous fix to overcome a compiler warning; the app NoCDR() has been updated to mark the channel CDR as POST_DISABLED instead of destroying the CDR; this way its flags are propagated thru a bridge and the CDR is actually dropped. The cases where only one channel in a bridge has a CDR was cleaned up. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@61136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-04-10 05:18:26 +00:00
Kevin P. Fleming
bf4969f66e fix up some warnings found using --enable-dev-mode 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@61070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-04-09 19:55:14 +00:00
Steve Murphy
7d5a79a0b9 This is a big improvement over the current CDR fixes. It may still need refinement, but this won't have as many folks bothered. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@60989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-04-09 18:32:07 +00:00
Steve Murphy
798039b4d8 several changes via kpflemings review 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@59522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-03-30 17:51:17 +00:00
Steve Murphy
9c69e34f62 These mods fix CDR issues from 8221, 8593, 8680, 8743, and perhaps others. Mainly with CDRs generated from transfer situations. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@59486 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-03-30 14:11:59 +00:00
Russell Bryant
2986791f67 Clean up a few coding guidelines issues - spaces to tabs, use sizeof() to pass 
the size of a static buffer, add spaces ...


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@54888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-02-16 17:40:38 +00:00
Steve Murphy
be0c0cd6dd this mod from 8593 (dstchannel in cdr is empty when transfer call). 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@51716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-01-23 20:32:54 +00:00
Joshua Colp
2db51f4608 Merged revisions 51145 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r51145 | file | 2007-01-16 12:36:50 -0500 (Tue, 16 Jan 2007) | 2 lines

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.4@51148 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-01-16 17:39:50 +00:00
Jason Parker
9e621e99a5 Save 1 whopping byte of allocated memory! 
This looks like it may have been a chicken/egg scenario..

You had to call a cleanup func, because everything was allocated.
Then since you had to call a cleanup func, you were forced to allocate - ie; strdup("").


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@49742 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-01-06 00:24:38 +00:00
Kevin P. Fleming
444adcb477 reduce stack consumption for AMI and AMI/HTTP requests by nearly 20K in most cases 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@49676 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2007-01-05 22:16:33 +00:00
Joshua Colp
0bed57a7f1 Merged revisions 48154 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48154 | file | 2006-11-30 14:04:11 -0500 (Thu, 30 Nov 2006) | 2 lines

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.4@48155 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-30 19:05:14 +00:00
Steve Murphy
517978fd5f These mods are to solve the problem in bug 7506. It's a lot of rework to solve a fairly small problem... such is life. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@47303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-07 23:46:41 +00:00
Tilghman Lesher
e05a2752e8 Reverse change of "show" to "list" and make several other commands more consistent with "category verb arguments" 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@47051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2006-11-02 23:00:20 +00:00