aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2004-09-26 20:47:01 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2004-09-26 20:47:01 +0000
commit6664a37250da58edba95bb5d739663bf96151278 (patch)
treee3253c927c35f54736a5d3038887d743771cd091
parent027a1124d3383f1a533f0ffce8a6483ed016d24d (diff)
make pick-up extension configurable. update ChangeLog
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3843 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xCHANGES5
-rwxr-xr-xconfigs/features.conf.sample1
-rwxr-xr-xres/res_features.c2
3 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 3d87f2ea8..066275c0a 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+ -- Fix inband PRI indication detection
+ -- Fix for MGCP - always request digits if no RTP stream
+ -- Fixed seg fault for ast_control_streamfile
+ -- Added AGI over TCP support
+ -- Make pick-up extension configurable via features.conf
Asterisk 1.0.0
-- Use Q.931 standard cause codes for asterisk cause codes
-- Bug fixes from the bug tracker
diff --git a/configs/features.conf.sample b/configs/features.conf.sample
index 0b037e249..be442c563 100755
--- a/configs/features.conf.sample
+++ b/configs/features.conf.sample
@@ -12,3 +12,4 @@ context => parkedcalls ; Which context parked calls are in
;courtesytone = beep ; Sound file to play to the parked caller
; when someone dials a parked call
;adsipark = yes ; if you want ADSI parking announcements
+;pickupexten = *8 ; Configure the pickup extension. Default is *8
diff --git a/res/res_features.c b/res/res_features.c
index 56a792047..b2fd1a866 100755
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -911,6 +911,8 @@ int load_module(void)
transferdigittimeout = transferdigittimeout * 1000;
} else if (!strcasecmp(var->name, "courtesytone")) {
strncpy(courtesytone, var->value, sizeof(courtesytone) - 1);
+ } else if (!strcasecmp(var->name, "pickupexten")) {
+ strncpy(pickup_ext, var->value, sizeof(pickup_ext) - 1);
}
var = var->next;
}