[asterisk-commits] russell: trunk r64354 - in /trunk: ./ res/res_features.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon May 14 16:17:52 2007
New Revision: 64354

URL: http://svn.digium.com/view/asterisk?view=rev&rev=64354
Log:
Merged revisions 64353 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r64353 | russell | 2007-05-14 16:16:39 -0500 (Mon, 14 May 2007) | 4 lines

When someone requests a specific parking space using the PARKINGEXTEN variable,
ensure that no other caller is already there.
(issue #9723, reported by mdu113, patch by me)

........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=64354&r1=64353&r2=64354
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Mon May 14 16:17:52 2007
@@ -336,6 +336,23 @@
 		return AST_DEVICE_INUSE;
 }
 
+/*!
+ * \brief Check to see if a parking space is in use
+ * \return non-zero if in use, zero if not in use
+ * \note Assumes parking_lock is locked
+ */
+static int check_parking_space_inuse(int space)
+{
+	struct parkeduser *pu;
+
+	for (pu = parkinglot; pu; pu = pu->next) {
+		if (pu->parkingnum == space)
+			return 1;
+	}
+
+	return 0;
+}
+
 /*! \brief Park a call 
  	\note We put the user in the parking list, then wake up the parking thread to be sure it looks
 	after these channels too */
@@ -361,6 +378,12 @@
 		}
 		ast_copy_string(pu->parkingexten, parkingexten, sizeof(pu->parkingexten));
 		x = atoi(parkingexten);
+		if (check_parking_space_inuse(x)) {
+			ast_mutex_unlock(&parking_lock);
+			free(pu);
+			ast_log(LOG_WARNING, "Requested parking space %d via PARKINGEXTEN, but it is in use!\n", x);
+			return -1;
+		}
 	} else {
 		/* Select parking space within range */
 		parking_range = parking_stop - parking_start+1;