Merge "res_parking: Misc fixes."
authorJoshua Colp <jcolp@digium.com>
Tue, 29 Mar 2016 14:03:55 +0000 (09:03 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 29 Mar 2016 14:03:55 +0000 (09:03 -0500)
1  2 
res/parking/parking_applications.c
res/parking/parking_bridge_features.c
res/res_parking.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;
@@@ -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);
  
Simple merge