diff options
| -rw-r--r-- | UPGRADE.txt | 11 | ||||
| -rw-r--r-- | main/core_unreal.c | 4 | ||||
| -rw-r--r-- | res/parking/parking_applications.c | 2 | ||||
| -rw-r--r-- | res/parking/parking_bridge_features.c | 7 |
4 files changed, 20 insertions, 4 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt index 471350c5a..4f40b2b9d 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -21,6 +21,17 @@ === UPGRADE-12.txt -- Upgrade info for 11 to 12 =========================================================== +From 13.8.0 to 13.9.0: + +res_parking: + - The dynamic parking lot creation channel variables PARKINGDYNAMIC, + PARKINGDYNCONTEXT, PARKINGDYNEXTEN, and PARKINGDYNPOS are now looked + for in the parker's channel instead of the parked channel. This is only + of significance if the parker uses blind transfer or the DTMF one-step + parking feature. You need to use the double underscore '__' inheritance + for these variables. The indefinite inheritance is also recommended + for the PARKINGEXTEN variable. + From 13.7.0 to 13.8.0: res_pjsip: diff --git a/main/core_unreal.c b/main/core_unreal.c index d57e01f18..028e371f6 100644 --- a/main/core_unreal.c +++ b/main/core_unreal.c @@ -687,13 +687,13 @@ void ast_unreal_call_setup(struct ast_channel *semi1, struct ast_channel *semi2) ast_connected_line_copy_from_caller(ast_channel_connected(semi2), ast_channel_caller(semi1)); ast_channel_language_set(semi2, ast_channel_language(semi1)); + ast_channel_musicclass_set(semi2, ast_channel_musicclass(semi1)); + ast_channel_parkinglot_set(semi2, ast_channel_parkinglot(semi1)); /* Crossover the accountcode and peeraccount to cross the unreal bridge. */ ast_channel_accountcode_set(semi2, ast_channel_peeraccount(semi1)); ast_channel_peeraccount_set(semi2, ast_channel_accountcode(semi1)); - ast_channel_musicclass_set(semi2, ast_channel_musicclass(semi1)); - ast_channel_cc_params_init(semi2, ast_channel_get_cc_config_params(semi1)); /* diff --git a/res/parking/parking_applications.c b/res/parking/parking_applications.c index d8cda6f50..48c7adcd3 100644 --- a/res/parking/parking_applications.c +++ b/res/parking/parking_applications.c @@ -455,7 +455,7 @@ struct ast_bridge *park_common_setup(struct ast_channel *parkee, struct ast_chan lot = parking_lot_find_by_name(lot_name); if (!lot) { - lot = parking_create_dynamic_lot(lot_name, parkee); + lot = parking_create_dynamic_lot(lot_name, parker); } if (!lot) { diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c index a21be9068..e74aed186 100644 --- a/res/parking/parking_bridge_features.c +++ b/res/parking/parking_bridge_features.c @@ -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); @@ -489,6 +490,9 @@ static int parking_park_call(struct ast_bridge_channel *parker, char *exten, siz 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); return -1; @@ -504,7 +508,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; } /*! |