[svn-commits] mvanbaak: branch group/multiparking r104058 - /team/group/multiparking/main/

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Sat Feb 23 10:50:20 2008
New Revision: 104058

URL: http://svn.digium.com/view/asterisk?view=rev&rev=104058
Log:
another bunch of missing stuff put back in

Modified:
    team/group/multiparking/main/features.c

Modified: team/group/multiparking/main/features.c
URL: http://svn.digium.com/view/asterisk/team/group/multiparking/main/features.c?view=diff&rev=104058&r1=104057&r2=104058
==============================================================================
--- team/group/multiparking/main/features.c (original)
+++ team/group/multiparking/main/features.c Sat Feb 23 10:50:20 2008
@@ -599,7 +599,7 @@
 /*! \brief Park a call */
 int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeout, int *extout)
 {
-	return park_call_full(chan, peer, timeout, extout, NULL);
+	return park_call_full(chan, peer, timeout, extout, NULL, NULL);
 }
 
 /* Park call via masquraded channel */
@@ -629,7 +629,7 @@
 
 	orig_chan_name = ast_strdupa(chan->name);
 
-	park_call_full(chan, peer, timeout, extout, orig_chan_name);
+	park_call_full(chan, peer, timeout, extout, orig_chan_name, NULL);
 
 	return 0;
 }
@@ -2481,11 +2481,24 @@
 	char orig_exten[AST_MAX_EXTENSION];
 	int orig_priority = chan->priority;
 
+	const char *parkinglotname = DEFAULT_PARKINGLOT;
+	struct ast_parkinglot *parkinglot = NULL;
+ 
 	/* Data is unused at the moment but could contain a parking
 	   lot context eventually */
 	int res = 0;
 
 	ast_copy_string(orig_exten, chan->exten, sizeof(orig_exten));
+
+	/* Check if the channel has a parking lot */
+	parkinglotname = findparkinglotname(chan);
+
+	if (parkinglotname) {
+		if (option_debug > 2)
+			ast_log(LOG_DEBUG, "Found chanvar Parkinglot: %s\n", parkinglotname);
+		parkinglot = find_parkinglot(parkinglotname);	
+	}
+
 
 	/* Setup the exten/priority to be s/1 since we don't know
 	   where this call should return */
@@ -2499,7 +2512,7 @@
 		res = ast_safe_sleep(chan, 1000);
 	/* Park the call */
 	if (!res) {
-		res = park_call_full(chan, chan, 0, NULL, orig_chan_name);
+		res = park_call_full(chan, chan, 0, NULL, orig_chan_name, parkinglot);
 		/* Continue on in the dialplan */
 		if (res == 1) {
 			ast_copy_string(chan->exten, orig_exten, sizeof(chan->exten));