From: Russell Bryant <russell@russellbryant.com>
Date: Sun, 26 Sep 2004 20:47:01 +0000 (+0000)
Subject: make pick-up extension configurable.  update ChangeLog
X-Git-Tag: 1.0.10~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efd42d2d5c6c78b7d20084249da87357c2d55b39;p=thirdparty%2Fasterisk.git

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 3d87f2ea80..066275c0a9 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 0b037e249a..be442c5636 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 56a7920471..b2fd1a866d 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;
 		}