summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Madsen <leif@leifmadsen.com>2011-05-27 21:40:52 +0000
committerLeif Madsen <leif@leifmadsen.com>2011-05-27 21:40:52 +0000
commita2ca0997a691af32d67aa15a8b3ca70376fb0960 (patch)
tree4039ae6831446d82e8a8539b136ff134e9f70c64
parentd211be98ed32927218807ca5aca06d4bca19bd95 (diff)
Merged revisions 321333 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r321333 | lmadsen | 2011-05-27 17:40:23 -0400 (Fri, 27 May 2011) | 7 lines Allow parking lot hints and musicclass to be set. (closes issue #19378) Reported by: sboily_proformatique Patches: pf_parkinghint_music_fix uploaded by sboily proformatique (license 206) Tested by: russell ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321334 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--main/features.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c
index f59054683..81421f17b 100644
--- a/main/features.c
+++ b/main/features.c
@@ -4787,6 +4787,10 @@ static struct ast_parkinglot *build_parkinglot(char *name, struct ast_variable *
ast_copy_string(parkinglot->parking_con, confvar->value, sizeof(parkinglot->parking_con));
} else if (!strcasecmp(confvar->name, "parkext")) {
ast_copy_string(parkinglot->parkext, confvar->value, sizeof(parkinglot->parkext));
+ } else if (!strcasecmp(confvar->name, "parkinghints")) {
+ parkinglot->parkaddhints = ast_true(confvar->value);
+ } else if (!strcasecmp(confvar->name, "parkedmusicclass")) {
+ ast_copy_string(parkinglot->mohclass, confvar->value, sizeof(parkinglot->mohclass));
} else if (!strcasecmp(confvar->name, "parkingtime")) {
if ((sscanf(confvar->value, "%30d", &parkinglot->parkingtime) != 1) || (parkinglot->parkingtime < 1)) {
ast_log(LOG_WARNING, "%s is not a valid parkingtime\n", confvar->value);