From 128e4022d04c290eed2a3549c2a7430f3e45699b Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 21 Dec 2009 17:00:46 +0000
Subject: [PATCH] Merged revisions 235821 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r235821 | tilghman | 2009-12-21 10:45:03 -0600 (Mon, 21 Dec 2009) | 8 lines
Send parking lot announcement to the channel which parked the call, not the park-ee.
(closes issue #16234)
Reported by: yeshuawatso
Patches:
20091210__issue16234.diff.txt uploaded by tilghman (license 14)
20091221__issue16234__1.4.diff.txt uploaded by tilghman (license 14)
Tested by: yeshuawatso
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@235822 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/features.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/main/features.c b/main/features.c
index 894b5b9a55..85d36991e1 100644
--- a/main/features.c
+++ b/main/features.c
@@ -696,10 +696,10 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan,
ast_log(LOG_DEBUG, "Found chanvar Parkinglot: %s\n", parkinglotname);
parkinglot = find_parkinglot(parkinglotname);
}
- if (!parkinglot)
- parkinglot = default_parkinglot;
+ if (!parkinglot) {
+ parkinglot = parkinglot_addref(default_parkinglot);
+ }
- parkinglot_addref(parkinglot);
if (option_debug)
ast_log(LOG_DEBUG, "Parkinglot: %s\n", parkinglot->name);
@@ -713,7 +713,7 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan,
AST_LIST_LOCK(&parkinglot->parkings);
/* Check for channel variable PARKINGEXTEN */
ast_channel_lock(chan);
- parkingexten = pbx_builtin_getvar_helper(chan, "PARKINGEXTEN");
+ parkingexten = ast_strdupa(S_OR(pbx_builtin_getvar_helper(chan, "PARKINGEXTEN"), ""));
ast_channel_unlock(chan);
if (!ast_strlen_zero(parkingexten)) {
/*!\note The API forces us to specify a numeric parking slot, even
@@ -732,10 +732,10 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan,
snprintf(pu->parkingexten, sizeof(pu->parkingexten), "%d", parking_space);
if (ast_exists_extension(NULL, parkinglot->parking_con, pu->parkingexten, 1, NULL)) {
+ ast_log(LOG_WARNING, "Requested parking extension already exists: %s@%s\n", parkingexten, parkinglot->parking_con);
AST_LIST_UNLOCK(&parkinglot->parkings);
parkinglot_unref(parkinglot);
ast_free(pu);
- ast_log(LOG_WARNING, "Requested parking extension already exists: %s@%s\n", parkingexten, parkinglot->parking_con);
return NULL;
}
} else {
@@ -784,7 +784,7 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan,
pu->notquiteyet = 1;
pu->parkingnum = parking_space;
- pu->parkinglot = parkinglot;
+ pu->parkinglot = parkinglot_addref(parkinglot);
AST_LIST_INSERT_TAIL(&parkinglot->parkings, pu, list);
parkinglot_unref(parkinglot);
@@ -993,7 +993,7 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i
}
if (!play_announcement && args == &park_args) {
- args->orig_chan_name = ast_strdupa(chan->name);
+ args->orig_chan_name = ast_strdupa(peer->name);
}
park_status = park_call_full(chan, peer, args);
--
GitLab