make pick-up extension configurable. update ChangeLog

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3843 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index 3d87f2ea808220789f3ba46b2b0159bd8991e505..066275c0a94ac099f19b450885a19fd8cc2cbc83 100755 (executable)
--- 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 0b037e249abaa33f00b2672153e68c6a54bbccde..be442c563687216e941ddf14714ed3ffebf233b3 100755 (executable)
--- 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 56a79204716a6cda7fe61f3900d7bc85a050340f..b2fd1a866d818c581b96691db643398792ec4d7f 100755 (executable)
--- 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;
                }