diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-10 21:01:20 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-10 21:01:20 +0000 |
| commit | 144ea34380f0d959c2a264ca12e0d9b10e31219e (patch) | |
| tree | 815c6d2433c10e55ac6d97213f55468b33c9beb9 /main | |
| parent | 78ceec94785d33968f42d09bfb97f81691877c8c (diff) | |
Merged revisions 251679 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r251679 | jpeeler | 2010-03-10 14:51:23 -0600 (Wed, 10 Mar 2010) | 13 lines
Fix ParkAndAnnounce not respecting parking options.
The patch ensures that if a peer does not exist, parking settings are read from
the channel. A unit test has been written to ensure proper operation for both
standard parking and parking using masquerades.
(closes issue #16592)
Reported by: mwyres
Patches:
bug_16592.diff uploaded by snuffy (license 35)
Review: https://reviewboard.asterisk.org/r/539/
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@251685 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index 4b34e9435..29567241b 100644 --- a/main/features.c +++ b/main/features.c @@ -574,6 +574,8 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan, if (peer) parkinglotname = findparkinglotname(peer); + else /* peer was NULL, check chan (ParkAndAnnounce / res_agi) */ + parkinglotname = findparkinglotname(chan); if (parkinglotname) { if (option_debug) @@ -890,7 +892,7 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i return 0; } -/* Park call via masquraded channel */ +/* Park call via masqueraded channel */ int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, int timeout, int *extout) { return masq_park_call(rchan, peer, timeout, extout, 0, NULL); |