From: Joshua Colp <jcolp@digium.com>
Date: Tue, 29 Mar 2016 14:03:55 +0000 (-0500)
Subject: Merge "res_parking: Misc fixes."
X-Git-Tag: 14.0.0-beta1~307
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ce25bd62a0f31aa616272585e4f1ea1f2b86fd9;p=thirdparty%2Fasterisk.git

Merge "res_parking: Misc fixes."
---

6ce25bd62a0f31aa616272585e4f1ea1f2b86fd9
diff --cc res/parking/parking_applications.c
index ea7223eac6,bd72b85d51..1c95b6f03f
--- a/res/parking/parking_applications.c
+++ b/res/parking/parking_applications.c
@@@ -496,9 -462,8 +503,8 @@@ struct ast_bridge *park_common_setup(st
  
  	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) {
  		ast_log(LOG_ERROR, "Could not find parking lot: '%s'\n", lot_name);
  		return NULL;
diff --cc res/parking/parking_bridge_features.c
index e053ed74ed,70c2fc6db0..4eb3f71ed4
--- a/res/parking/parking_bridge_features.c
+++ b/res/parking/parking_bridge_features.c
@@@ -236,9 -236,9 +236,10 @@@ static struct ast_channel *park_local_t
  	/* 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_bridge_set_transfer_variables(parkee, ast_channel_name(parker), 0);
  	ast_channel_datastore_inherit(parker, parkee);
  	ast_channel_unlock(parker);