From c57a2735d8446f11b733039993f885cc7eace46c Mon Sep 17 00:00:00 2001
From: Jonathan Rose <jrose@digium.com>
Date: Thu, 6 Jun 2013 18:21:18 +0000
Subject: [PATCH] Parking: Enable code responsible for intercepting park exten
transfers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@390669 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/bridging.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/main/bridging.c b/main/bridging.c
index 3c474f2f0c..488b7c60c2 100644
--- a/main/bridging.c
+++ b/main/bridging.c
@@ -5386,30 +5386,22 @@ enum try_parking_result {
static enum try_parking_result try_parking(struct ast_bridge *bridge, struct ast_channel *transferer,
const char *exten, const char *context)
{
- /* BUGBUG The following is all commented out because the functionality is not
- * present yet. The functions referenced here are available at team/jrose/bridge_projects.
- * Once the code there has been merged into team/group/bridge_construction,
- * this can be uncommented and tested
- */
-
-#if 0
RAII_VAR(struct ast_bridge_channel *, transferer_bridge_channel, NULL, ao2_cleanup);
struct ast_exten *parking_exten;
ast_channel_lock(transferer);
- transfer_bridge_channel = ast_channel_get_bridge_channel(transferer);
+ transferer_bridge_channel = ast_channel_get_bridge_channel(transferer);
ast_channel_unlock(transferer);
- if (!transfer_bridge_channel) {
+ if (!transferer_bridge_channel) {
return PARKING_FAILURE;
}
parking_exten = ast_get_parking_exten(exten, NULL, context);
if (parking_exten) {
- return ast_park_blind_xfer(bridge, transferer, parking_exten) == 0 ?
+ return ast_park_blind_xfer(bridge, transferer_bridge_channel, parking_exten) == 0 ?
PARKING_SUCCESS : PARKING_FAILURE;
}
-#endif
return PARKING_NOT_APPLICABLE;
}
--
GitLab