[asterisk-commits] qwell: branch 1.4 r96573 - /branches/1.4/res/res_features.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Jan  4 16:55:56 2008
New Revision: 96573

URL: http://svn.digium.com/view/asterisk?view=rev&rev=96573
Log:
Properly continue in the dialplan if using PARKINGEXTEN and the slot is full.

Issue 11237, patch by me.

Modified:
    branches/1.4/res/res_features.c

Modified: branches/1.4/res/res_features.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_features.c?view=diff&rev=96573&r1=96572&r2=96573
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Fri Jan  4 16:55:56 2008
@@ -325,7 +325,7 @@
 			ast_mutex_unlock(&parking_lock);
 			free(pu);
 			ast_log(LOG_WARNING, "Requested parking extension already exists: %s@%s\n", parkingexten, parking_con);
-			return 0;	/* Continue execution if possible */
+			return 1;	/* Continue execution if possible */
 		}
 		ast_copy_string(pu->parkingexten, parkingexten, sizeof(pu->parkingexten));
 		x = atoi(parkingexten);
@@ -1811,12 +1811,17 @@
 	 * of a park--it is still theoretically possible for a transfer to happen before
 	 * we get here, but it is _really_ unlikely */
 	char *orig_chan_name = ast_strdupa(chan->name);
+	char orig_exten[AST_MAX_EXTENSION];
+	int orig_priority = chan->priority;
+
 	/* Data is unused at the moment but could contain a parking
 	   lot context eventually */
 	int res = 0;
 	struct ast_module_user *u;
 
 	u = ast_module_user_add(chan);
+
+	ast_copy_string(orig_exten, chan->exten, sizeof(orig_exten));
 
 	/* Setup the exten/priority to be s/1 since we don't know
 	   where this call should return */
@@ -1829,12 +1834,20 @@
 	if (!res)
 		res = ast_safe_sleep(chan, 1000);
 	/* Park the call */
-	if (!res)
+	if (!res) {
 		res = park_call_full(chan, NULL, 0, NULL, orig_chan_name);
+		/* Continue on in the dialplan */
+		if (res == 1) {
+			ast_copy_string(chan->exten, orig_exten, sizeof(chan->exten));
+			chan->priority = orig_priority;
+			res = 0;
+		} else if (!res)
+			res = AST_PBX_KEEPALIVE;
+	}
 
 	ast_module_user_remove(u);
 
-	return !res ? AST_PBX_KEEPALIVE : res;
+	return res;
 }
 
 /*! \brief Pickup parked call */