kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_parking: Fix blind transfer dynamic lots creation." into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-03-26 14:25:53 -05:00
committed by Gerrit Code Review
parent 3974bf1ef0 50f90d4099
commit c88c09a920
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/parking/parking_bridge_features.c
View File

@@ -236,6 +236,7 @@ static struct ast_channel *park_local_transfer(struct ast_channel *parker, const
/* Before we actually dial out let's inherit appropriate information. */
ast_channel_lock_both(parker, parkee);
ast_channel_req_accountcodes(parkee, parker, AST_CHANNEL_REQUESTOR_REPLACEMENT);
ast_channel_parkinglot_set(parkee, ast_channel_parkinglot(parker));
ast_connected_line_copy_from_caller(ast_channel_connected(parkee), ast_channel_caller(parker));
ast_channel_inherit_variables(parker, parkee);
ast_channel_datastore_inherit(parker, parkee);
@@ -481,6 +482,9 @@ static int parking_park_call(struct ast_bridge_channel *parker, char *exten, siz
ast_channel_unlock(parker->chan);
lot = parking_lot_find_by_name(lot_name);
if (!lot) {
lot = parking_create_dynamic_lot(lot_name, parker->chan);
}
if (!lot) {
ast_log(AST_LOG_WARNING, "Cannot Park %s: lot %s unknown\n",
ast_channel_name(parker->chan), lot_name);
@@ -497,7 +501,8 @@ static int feature_park_call(struct ast_bridge_channel *bridge_channel, void *ho
{
SCOPED_MODULE_USE(parking_get_module_info()->self);
return parking_park_call(bridge_channel, NULL, 0);
parking_park_call(bridge_channel, NULL, 0);
return 0;
}
/*!