746c746
< 	const char *parkingexten;
---
> 	const char *parkingexten, *temp;
748a749,768
> 
> 	/* Park() does not resprect the PARKINGLOT channel variable and ParkAndAnnounce() does.
> 	   I would like to change this behavior, so if i have a PARKINGLOT channel variable, use it
> 	   even I have a lot already picked out. PCPIII */
> /*	if (peer) {
> 		temp = pbx_builtin_getvar_helper(peer, "PARKINGLOT");
> 		if (temp) {
> 			ast_verb(3, "PCPIII PSR - chan: %s, chanlot: %s, chanvar: %s\n", peer->name, peer->parkinglot, temp);
> 		} else {
> 			ast_verb(3, "PCPIII PSR - chan: %s, chanlot: %s, no chanvar.\n", peer->name, peer->parkinglot);
> 		}
> 	}
> 	if (chan) {
>                 temp = pbx_builtin_getvar_helper(chan, "PARKINGLOT");
>                 if (temp) {
>                         ast_verb(3, "PCPIII PSR - chan: %s, chanlot: %s, chanvar: %s\n", chan->name, chan->parkinglot, temp);
>                 } else {
>                         ast_verb(3, "PCPIII PSR - chan: %s, chanlot: %s, no chanvar.\n", chan->name, chan->parkinglot);
>                 }
> 	}	*/
751a772,777
> //		ast_verb(3,"PCPIII PSR - already have lot.\n");
> 		temp = findparkinglotname(chan);
> 		if (temp) {
> 			parkinglotname = temp;
> 			args->parkinglot = NULL;
> 		}
753a780
> //		ast_verb(3,"PCPIII PSR - getting lot name from peer.\n");
757a785,786
> //	ast_verb(3,"PCPIII PSR - name: %s\n", parkinglotname);
> 
1057a1087
> //	ast_verb(3,"PCPIII parking a call: lot: %s, exten: %s\n", found_lot->name, parkexten);
1082c1112
< 
---
> //	ast_verb(3,"PCPIII: masq_park_call\n");
1129a1160
> //	ast_verb(3,"PCPIII ast_masq_park_call\n");
1134a1166
> //	ast_verb(3,"PCPIII masq_park_call_announce\n");
1327a1360
> //	ast_verb(3,"PCPIII parkcall_helper\n");
4007a4041
> //	ast_verb(3, "PCPIII park_call_exec\n");
4039a4074,4075
> 
> 		ast_verb(3,"PCPIII park_call_exec - log: %s, exten: %s\n", args.parkinglot->name, orig_exten);
4063a4100
> 	const char *temp;
4067a4105,4108
> 	/* The issue I have with this is that it fetches by extension only, no regard to the actual lot.
> 	 * This means that all lot slots need to be universally unique. No fun to manage.
> 	 * I want this to pay attention to the lot and search it. PCPIII
> 	 */
4069,4070c4110,4119
< 	parkinglot = ao2_callback(parkinglots, 0, find_parkinglot_by_position_cb, (void *) &park);
< 	if (!parkinglot)
---
> 	temp = findparkinglotname(chan);
> 	if (temp) {
> 		parkinglot = find_parkinglot(temp);
> 	} else {
> 		ast_verb(3, "PCPIII park_exec_full - did not find a lot name, searching by slot number.\n");
> 		parkinglot = ao2_callback(parkinglots, 0, find_parkinglot_by_position_cb, (void *) &park);
> 	}
> 
> 	if (!parkinglot) {
> 		ast_verb(3, "PCPIII call back returned nothing\n");
4071a4121,4123
> 	}
> 
> 	ast_verb(3,"PCPIII: using lot %s-%s-%s (data: %s)\n", parkinglot->name, parkinglot->parkext, parkinglot->parking_con, data);
4336a4389,4390
> 		} else if (!strcasecmp(confvar->name, "parkedmusicclass")) {
> 			ast_copy_string(parkinglot->mohclass, confvar->value, sizeof(parkinglot->mohclass));
5193a5248
> //	ast_verb(3,"PCPIII manager_park\n");