aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configs/features.conf.sample7
-rw-r--r--res/res_features.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/configs/features.conf.sample b/configs/features.conf.sample
index 346d65192..9fb94ff18 100644
--- a/configs/features.conf.sample
+++ b/configs/features.conf.sample
@@ -3,7 +3,7 @@
;
[general]
-parkext => 700 ; What ext. to dial to park
+parkext => 700 ; What extension to dial to park
parkpos => 701-720 ; What extensions to park calls on
context => parkedcalls ; Which context parked calls are in
;parkingtime => 45 ; Number of seconds a call can be parked for
@@ -27,6 +27,11 @@ context => parkedcalls ; Which context parked calls are in
;atxfer => *2 ; Attended transfer
[applicationmap]
+; Note that the DYNAMIC_FEATURES channel variable must be set to use the features
+; defined here. The value of DYNAMIC_FEATURES should be the names of the features
+; to allow the channel to use separated by '#'. For example:
+; Set(DYNAMIC_FEATURES=myfeature1#myfeature2#myfeature3)
+;
;testfeature => #9,callee,Playback,tt-monkeys ;Play tt-monkeys to
;callee if #9 was pressed
diff --git a/res/res_features.c b/res/res_features.c
index bf23129ae..bf248b5f4 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -362,7 +362,7 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
"Timeout: %ld\r\n"
"CallerID: %s\r\n"
"CallerIDName: %s\r\n"
- ,pu->parkingnum, pu->chan->name, peer->name
+ ,pu->parkingnum, pu->chan->name, peer ? peer->name : ""
,(long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL)
,(pu->chan->cid.cid_num ? pu->chan->cid.cid_num : "<unknown>")
,(pu->chan->cid.cid_name ? pu->chan->cid.cid_name : "<unknown>")