summaryrefslogtreecommitdiff
path: root/res/parking/parking_controller.c
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2013-06-25 22:28:22 +0000
committerJonathan Rose <jrose@digium.com>2013-06-25 22:28:22 +0000
commit854c4c64fe2851312b1e13857dcd18e743e07594 (patch)
tree80d042e06f38f95d4f1fd2adc07658b2cbd46038 /res/parking/parking_controller.c
parent5b40420813318e08b9186d41aaf1d1aaff8d61e1 (diff)
res_parking: Add Parking manager action to the new parking system
(closes issue ASTERISK-21641) Reported by: Matt Jordan Review: https://reviewboard.asterisk.org/r/2573/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392915 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/parking/parking_controller.c')
-rw-r--r--res/parking/parking_controller.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/res/parking/parking_controller.c b/res/parking/parking_controller.c
index 8f2433b29..2764f50d4 100644
--- a/res/parking/parking_controller.c
+++ b/res/parking/parking_controller.c
@@ -244,15 +244,8 @@ int comeback_goto(struct parked_user *pu, struct parking_lot *lot)
{
struct ast_channel *chan = pu->chan;
char *peername;
- const char *blindtransfer;
- ast_channel_lock(chan);
- if ((blindtransfer = pbx_builtin_getvar_helper(chan, "BLINDTRANSFER"))) {
- blindtransfer = ast_strdupa(blindtransfer);
- }
- ast_channel_unlock(chan);
-
- peername = blindtransfer ? ast_strdupa(blindtransfer) : ast_strdupa(pu->parker->name);
+ peername = ast_strdupa(S_OR(pu->blindtransfer, pu->parker->name));
/* Flatten the peername so that it can be used for performing the timeout PBX operations */
flatten_peername(peername);