aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-05-14 21:16:39 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-05-14 21:16:39 +0000
commitbb420210ceefe17806e6a651728155efcc0c69d3 (patch)
treebcdf8451729690a6ccbae891c5ee85011d94710b /res
parentff325668f562370907bd95663045c875dfdf52cb (diff)
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) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@64353 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_features.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/res/res_features.c b/res/res_features.c
index e4d3645f3..bc045bb9d 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -305,6 +305,23 @@ static int metermaidstate(const char *data)
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 */
@@ -330,6 +347,12 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
}
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;