aboutsummaryrefslogtreecommitdiffstats
path: root/configs
AgeCommit message (Collapse)AuthorFilesLines
2009-07-27Merged revisions 209132 via svnmerge from mmichelson1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r209132 | mmichelson | 2009-07-27 12:50:04 -0500 (Mon, 27 Jul 2009) | 24 lines Merged revisions 209131 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r209131 | mmichelson | 2009-07-27 12:44:06 -0500 (Mon, 27 Jul 2009) | 18 lines Allow for UDPTL to use only even-numbered ports if desired. There are some VoIP providers out there that will not accept SDP offers with odd numbered UDPTL ports. While it is my personal opinion that these VoIP providers are misinterpreting RFC 2327, it really is not a big deal to play along with their silly little games. Of course, since restricting UDPTL ports to only even numbers reduces the range of available ports by half, so the option to use only even port numbers is off by default. A user can enable the behavior by setting use_even_ports=yes in udptl.conf. (closes issue #15182) Reported by: CGMChris Patches: 15182.patch uploaded by mmichelson (license 60) Tested by: CGMChris ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@209134 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-18Merged revisions 145293,158010 fromrmudgett1-3/+3
https://origsvn.digium.com/svn/asterisk/branches/1.4 to make merging easier. These changes are already on trunk. ................ r145293 | rmudgett | 2008-09-30 18:55:24 -0500 (Tue, 30 Sep 2008) | 54 lines channels/chan_misdn.c channels/misdn/isdn_lib.c * Miscellaneous other fixes from trunk to make merging easier later. ........ r145200 | rmudgett | 2008-09-30 16:00:54 -0500 (Tue, 30 Sep 2008) | 7 lines * Miscellaneous formatting changes to make v1.4 and trunk more merge compatible in the mISDN area. channels/chan_misdn.c * Eliminated redundant code in cb_events() EVENT_SETUP ........ r144257 | crichter | 2008-09-24 03:42:55 -0500 (Wed, 24 Sep 2008) | 9 lines improved helptext of misdn_set_opt. ........ r142181 | rmudgett | 2008-09-09 12:30:52 -0500 (Tue, 09 Sep 2008) | 1 line Cleaned up comment ........ r138738 | rmudgett | 2008-08-18 16:07:28 -0500 (Mon, 18 Aug 2008) | 30 lines channels/chan_misdn.c * Made bearer2str() use allowed_bearers_array[] * Made use the causes.h defines instead of hardcoded numbers. * Made use Asterisk presentation indicator values if either of the mISDN presentation or screen options are negative. * Updated the misdn_set_opt application option descriptions. * Renamed the awkward Caller ID presentation misdn_set_opt application option value not_screened to restricted. Deprecated the not_screened option value. channels/misdn/isdn_lib.c * Made use the causes.h defines instead of hardcoded numbers. * Fixed some spelling errors and typos. * Added all defined facility code strings to fac2str(). channels/misdn/isdn_lib.h * Added doxygen comments to struct misdn_bchannel. channels/misdn/isdn_lib_intern.h * Added doxygen comments to struct misdn_stack. channels/misdn_config.c configs/misdn.conf.sample * Updated the mISDN presentation and screen parameter descriptions. doc/misdn.txt (doc/tex/misdn.tex) * Updated the misdn_set_opt application option descriptions. * Fixed some spelling errors and typos. ................ r158010 | rmudgett | 2008-11-19 19:46:09 -0600 (Wed, 19 Nov 2008) | 9 lines Merged revision 157977 from https://origsvn.digium.com/svn/asterisk/team/group/issue8824 ........ Fixes JIRA ABE-1726 The dial extension could be empty if you are using MISDN_KEYPAD to control ISDN provider features. ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@207287 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-17Merged revisions 207095 via svnmerge from jpeeler1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r207095 | jpeeler | 2009-07-17 14:16:35 -0500 (Fri, 17 Jul 2009) | 2 lines Update some missing allowed options for overlapdial ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@207101 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-16Merged revisions 206873 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r206873 | dvossel | 2009-07-16 16:33:51 -0500 (Thu, 16 Jul 2009) | 12 lines Merged revisions 206872 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r206872 | dvossel | 2009-07-16 16:33:19 -0500 (Thu, 16 Jul 2009) | 6 lines error in iax.conf related IP-based access control (closes issue #15518) Reported by: pkempgen ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@206875 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-26Merged revisions 203699 via svnmerge from file1-4/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r203699 | file | 2009-06-26 16:27:24 -0300 (Fri, 26 Jun 2009) | 2 lines Improve T.38 negotiation by exchanging session parameters between application and channel. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@203703 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-15Merged revisions 165180,200689 via svnmerge from kpfleming1-12/+22
https://origsvn.digium.com/svn/asterisk/trunk ........ r165180 | mnicholson | 2008-12-17 12:49:12 -0600 (Wed, 17 Dec 2008) | 14 lines This patch adds a new 'ignoresdpversion' option to sip.conf. When this is enabled (either globally or for a specific peer), chan_sip will treat any SDP data it receives as new data and update the media stream accordingly. By default, Asterisk will only modify the media stream if the SDP session version received is different from the current SDP session version. This option is required to interoperate with devices that have non-standard SDP session version implementations (observed by toc on the bug tracker with Microsoft OCS which always uses 0 as the session version). http://reviewboard.digium.com/r/94/ (closes issue #13958) Reported by: toc Tested by: toc ........ r200689 | kpfleming | 2009-06-15 15:42:38 -0500 (Mon, 15 Jun 2009) | 12 lines Accept T.38 re-INVITE responses with invalid SDP versions. This commit changes the 'incoming SDP version' check logic a bit more; when 'ignoresdpversion' is *not* set for a peer, if we initiate a re-INVITE to switch to T.38, we'll always accept the peer's SDP response, even if they don't properly increment the SDP version number as they should. If this situation occurs, a warning message will be generated suggesting that the peer's configuration be changed to include the 'ignoresdpversion' configuration option (although ideally they'd fix their SIP implementation to be RFC compliant). AST-221 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@200707 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-02Merged revisions 198791 via svnmerge from file1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r198791 | file | 2009-06-02 10:48:06 -0300 (Tue, 02 Jun 2009) | 5 lines Correct documentation for the register line, specifically where the domain should be specified. (closes issue #14367) Reported by: Nick_Lewis ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@198793 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-29Merged revisions 198186 via svnmerge from russell1-6/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r198186 | russell | 2009-05-29 18:04:31 -0500 (Fri, 29 May 2009) | 2 lines Suggesting that only a single timing module be loaded is no longer necessary. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@198187 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-28issue #15155 and issue #15156 from trunkghenry1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@197440 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-27Merged revisions 197089 via svnmerge from seanbright5-11/+12
https://origsvn.digium.com/svn/asterisk/trunk ........ r197089 | seanbright | 2009-05-27 12:07:57 -0400 (Wed, 27 May 2009) | 6 lines Fix references to /etc/dahdi/system.conf and /etc/asterisk/chan_dahdi.conf in the sample configuration files. (closes issue #15207) Reported by: seandarcy ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@197091 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-22Merged revisions 196416 via svnmerge from dvossel1-4/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r196416 | dvossel | 2009-05-22 16:09:45 -0500 (Fri, 22 May 2009) | 19 lines SIP set outbound transport type from Registration In sip.conf the transport option allows for the configuration of what transport types (udp, tcp, and tls) a peer will accept, but only the first type listed was used for outbound connections. This patch changes this. Now the default transport type is only used until the peer registers. When registration takes place the transport type is parsed out of the Contact header. If the Contact header's transport type is equal to one that the peer supports, the peer's default transport type for outbound connections is set to match the Contact header's type. If the Contact header's transport type is not present, then the peer's default transport type is set to match the one the peer registered with. When a peer unregisters or the registration expires, the default transport type for that peer is reset. (closes issue #12282) Reported by: rjain Patches: reg_patch_1.diff uploaded by dvossel (license 671) Tested by: dvossel (closes issue #14727) Reported by: pj Patches: reg_patch_3.diff uploaded by dvossel (license 671) Tested by: pj, dvossel Review: https://reviewboard.asterisk.org/r/249/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@196453 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-15Merged revisions 194765 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r194765 | russell | 2009-05-15 13:43:42 -0500 (Fri, 15 May 2009) | 10 lines Merged revisions 194764 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r194764 | russell | 2009-05-15 13:43:18 -0500 (Fri, 15 May 2009) | 2 lines Fix some spelling fail. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@194767 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-08Merged revisions 193194 via svnmerge from kpfleming1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r193194 | kpfleming | 2009-05-08 09:06:15 -0500 (Fri, 08 May 2009) | 13 lines Merged revisions 193193 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r193193 | kpfleming | 2009-05-08 09:03:28 -0500 (Fri, 08 May 2009) | 7 lines Make absolute paths for logger channels work properly (Note: This is not a new feature, it was previously undocumented and broken.) The Asterisk logger has a feature to support absolute pathnames for logger channels, but the code implementing the feature was broken. This has been fixed, and the absolute path feature is now documented in the sample logger.conf. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@193196 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-04Merged revisions 191955 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r191955 | kpfleming | 2009-05-04 11:57:36 +0200 (Mon, 04 May 2009) | 8 lines Ensure that by default only one console channel driver is loaded This configuration file was changed to ensure that only one console channel driver (chan_oss) is loaded by default, but the change would only work if chan_console was not built. Now it will work as expected; if chan_alsa or chan_console are built and installed, they will not be loaded unless explicity requested. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@191957 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-03Merged revisions 186444,186447 via svnmerge from tilghman1-0/+9
https://origsvn.digium.com/svn/asterisk/trunk ................ r186444 | tilghman | 2009-04-03 14:30:34 -0500 (Fri, 03 Apr 2009) | 14 lines Merged revisions 186415 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r186415 | tilghman | 2009-04-03 14:06:58 -0500 (Fri, 03 Apr 2009) | 7 lines Distinguish in a sent email between simple sends and forwards. (closes issue #11678) Reported by: jamessan Patches: 20090330__bug11678.diff.txt uploaded by tilghman (license 14) Tested by: tilghman, lmadsen ........ ................ r186447 | tilghman | 2009-04-03 14:59:55 -0500 (Fri, 03 Apr 2009) | 9 lines Merged revisions 186445 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r186445 | tilghman | 2009-04-03 14:56:48 -0500 (Fri, 03 Apr 2009) | 2 lines Found a conflict in the last commit, due to multiple targets ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@186448 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-02Merged revisions 186175 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r186175 | mmichelson | 2009-04-02 16:56:21 -0500 (Thu, 02 Apr 2009) | 11 lines Merged revisions 186174 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r186174 | mmichelson | 2009-04-02 16:55:34 -0500 (Thu, 02 Apr 2009) | 5 lines Fix instructions in one-step parking comment to make more sense. Changed a capital K to a lowercase k. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@186177 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-02Merged revisions 186060 via svnmerge from tilghman1-2/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r186060 | tilghman | 2009-04-02 12:10:28 -0500 (Thu, 02 Apr 2009) | 16 lines Merged revisions 186059 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r186059 | tilghman | 2009-04-02 12:09:13 -0500 (Thu, 02 Apr 2009) | 9 lines Merged revisions 186056 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r186056 | tilghman | 2009-04-02 12:02:18 -0500 (Thu, 02 Apr 2009) | 2 lines Fix for AST-2009-003 ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@186062 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-30Merged revisions 185123 via svnmerge from rmudgett1-4/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r185123 | rmudgett | 2009-03-30 15:42:14 -0500 (Mon, 30 Mar 2009) | 9 lines Merged revisions 185121 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r185121 | rmudgett | 2009-03-30 15:40:11 -0500 (Mon, 30 Mar 2009) | 1 line Update the channel allocation method documentation. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@185127 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-24Merged revisions 183914 via svnmerge from tilghman1-2/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r183914 | tilghman | 2009-03-24 10:26:42 -0500 (Tue, 24 Mar 2009) | 10 lines Merged revisions 183913 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r183913 | tilghman | 2009-03-24 10:25:42 -0500 (Tue, 24 Mar 2009) | 3 lines Additionally note that the operator option needs an 'o' extension. (Related to issue #14731) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@183916 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-11Merged revisions 181499 via svnmerge from mvanbaak1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk Provide correct hint to debug SIP trouble in the default config (closes issue #14646) Reported by: strk git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@181521 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-05Merged revisions 180383 via svnmerge from mmichelson1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r180383 | mmichelson | 2009-03-05 13:14:14 -0600 (Thu, 05 Mar 2009) | 31 lines Merged revisions 180380 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r180380 | mmichelson | 2009-03-05 12:58:48 -0600 (Thu, 05 Mar 2009) | 25 lines Fix broken mailbox parsing when searchcontexts option is enabled. When using the searchcontexts option in voicemail.conf, the code made the assumption that all mailbox names defined were unique across all contexts. However, the code did nothing to actually enforce this assumption, nor did it do anything to alert a user that he may have created an ambiguity in his voicemail.conf file by defining the same mailbox name in multiple contexts. With this change, we now will issue a nice long warning if searchcontexts is on and we encounter the same mailbox name in multiple contexts and ignore any duplicates after the first box. Whether searchcontexts is enabled or not, if we come across a duplicate mailbox in the same context, then we will issue a warning and ignore the duplicated mailbox. I have also added a small note to voicemail.conf.sample in the explanation for searchcontexts explaining that you cannot define the same mailbox in multiple contexts if you have enabled the option. (closes issue #14599) Reported by: lmadsen Patches: 14599.patch uploaded by mmichelson (license 60) (with slight modification) Tested by: lmadsen ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@180425 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-03Merged revisions 180007 via svnmerge from mmichelson1-0/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r180007 | mmichelson | 2009-03-03 16:49:07 -0600 (Tue, 03 Mar 2009) | 22 lines Merged revisions 180006 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r180006 | mmichelson | 2009-03-03 16:48:18 -0600 (Tue, 03 Mar 2009) | 17 lines Clarify some documentation of queues.conf.sample It had always been possible to explicitly specify a "blank" value for a sound file in queues.conf and have no sound played back. The problem with this is that it would result in some ugly CLI warnings from file.c. This commit introduces a check when playing a file in app_queue to see if the name of the file is zero-length and return early if that is the case. Also, the ability to specify the blank sound files in queues.conf is now mentioned more clearly in queues.conf.sample (closes issue #14227) Reported by: caspy ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@180009 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-27Merged revisions 179164 via svnmerge from russell1-0/+9
https://origsvn.digium.com/svn/asterisk/trunk ........ r179164 | russell | 2009-02-27 15:47:18 -0600 (Fri, 27 Feb 2009) | 2 lines Mark res_ais as experimental, as the binary event format is subject to change. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@179166 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-27Merged revisions 178986 via svnmerge from murf1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r178986 | murf | 2009-02-26 20:45:58 -0700 (Thu, 26 Feb 2009) | 26 lines Merged revisions 178956 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 In this case, it's just a matter of reducing the default timeouts from 2000 to 1000 msec, as the max def feature digit timeout is no longer halved. ........ r178956 | murf | 2009-02-26 14:27:32 -0700 (Thu, 26 Feb 2009) | 18 lines This change moves the default feature digit timeout to 1000 ms from the previous default of 500. As per bug 14515, a dev discussion arrived at a "mediated concensus" of a default feature digit timeout of 1.0 sec. Some voted for 1300; ctooley thought 1500 for distracted phone users in phone booths; kpfleming put his foot down at 1.0 sec. Users who found the previous default max delay of 250 msec perfect, are welcome to override the new default. Notice that I said that 250 msec was the default; wait a minute, you might say, the config file said it was 500 msec!; well, because of the bug fix for 14515, we found that 500 msec was actually enforcing a max of 250. The bug fix would restore 500 msec, but we felt even that was a bit tight for most users... 2000 msec was pushed earlier by mmichelson, so that reduces to 1000 msec after the bug fix. Enjoy! ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@178988 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-24Merged revisions 178446 via svnmerge from tilghman1-0/+8
https://origsvn.digium.com/svn/asterisk/trunk ................ r178446 | tilghman | 2009-02-24 17:27:23 -0600 (Tue, 24 Feb 2009) | 12 lines Merged revisions 178445 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r178445 | tilghman | 2009-02-24 17:25:24 -0600 (Tue, 24 Feb 2009) | 5 lines Add section about the #exec command in configuration files. (closes issue #14540) Reported by: jtodd Patch by: jtodd, with additional notes by tilghman (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@178448 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-16Eliminate mention of a variable which exists only in trunk.tilghman1-6/+4
(Thanks, jsmith) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@176099 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-13Merged revisions 175597 via svnmerge from dvossel1-5/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r175597 | dvossel | 2009-02-13 14:11:55 -0600 (Fri, 13 Feb 2009) | 4 lines Fixed iax2 key rotation backwards compatibility Turns key rotation back on by default. Added bit into encryption IE to indicate whether or not key rotation is supported or not. If it is not supported then it is not enabled, which insures backwards compatibility. This eliminates the need for the keyrotate option in iax.conf, so it has been removed. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@175662 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-05Merged revisions 173776 via svnmerge from mmichelson1-15/+13
https://origsvn.digium.com/svn/asterisk/trunk ........ r173776 | mmichelson | 2009-02-05 17:48:48 -0600 (Thu, 05 Feb 2009) | 14 lines Update extensions.conf.sample to be correct. In trunk, the only necessary change pointed out was that the call to ChanIsAvail uses an option that has been removed. For the 1.6.1 branch, however, it appears that the sample file is badly in need of updating since there are |'s used all over the place there. My tentative plan is just to copy trunk's sample config file to those branches since the info there is most up-to-date and should be correct for use in 1.6.1 Thanks to macli in #asterisk-dev for bringing this up ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@173779 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-03Merged revisions 173104 via svnmerge from tilghman1-1/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r173104 | tilghman | 2009-02-02 18:24:52 -0600 (Mon, 02 Feb 2009) | 12 lines Merged revisions 173070 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r173070 | tilghman | 2009-02-02 18:15:59 -0600 (Mon, 02 Feb 2009) | 5 lines Add warning to standard config, that globals may be overridden by other dialplan configuration files. (closes issue #14388) Reported by: macli ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@173115 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-02Merged revisions 172894 via svnmerge from lmadsen1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r172894 | lmadsen | 2009-02-02 13:13:40 -0500 (Mon, 02 Feb 2009) | 7 lines Update the res_ldap.conf file with a better working example. (closes issue #13861) Reported by: scramatte Patches: __20080110-res_ldap.conf-2.patch uploaded by blitzrage (license 10) Tested by: jcovert ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@172895 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-31Merged revisions 172581 via svnmerge from twilson1-2/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r172581 | twilson | 2009-01-30 15:50:03 -0600 (Fri, 30 Jan 2009) | 2 lines Remove incorret line from sample config ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@172638 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-31Merged revisions 172580 via svnmerge from twilson1-0/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r172580 | twilson | 2009-01-30 15:29:12 -0600 (Fri, 30 Jan 2009) | 44 lines Merged revisions 172517 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r172517 | twilson | 2009-01-30 11:47:41 -0600 (Fri, 30 Jan 2009) | 37 lines Fix feature inheritance with builtin features When using builtin features like parking and transfers, the AST_FEATURE_* flags would not be set correctly for all instances when either performing a builtin attended transfer, or parking a call and getting the timeout callback. Also, there was no way on a per-call basis to specify what features someone should have on picking up a parked call (since that doesn't involve the Dial() command). There was a global option for setting whether or not all users who pickup a parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT, AUTOMON, or PARKCALL. This patch: 1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the dialplan or with setvar in channels that support it. This variable can be set to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the equivalent dial options), to set what features should be activated on this channel. The patch moves the setting of the features datastores into the bridging code instead of app_dial to help facilitate this. 2) adds global options parkedcallparking, parkedcallhangup, and parkedcallrecording to be similar to the parkedcalltransfers option for globally setting features. 3) has builtin_atxfer call builtin_parkcall if being transfered to the parking extension since tracking everything through multiple masquerades, etc. is difficult and error-prone 4) attempts to fix all cases of return calls from parking and completed builtin transfers not having the correct permissions (closes issue #14274) Reported by: aragon Patches: fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396) Tested by: aragon, otherwiseguy Review http://reviewboard.digium.com/r/138/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@172636 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-29Merged revisions 172400 via svnmerge from rmudgett1-3/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r172400 | rmudgett | 2009-01-29 14:38:34 -0600 (Thu, 29 Jan 2009) | 12 lines channels/chan_dahdi.c * Added doxygen comments to the major dahdi structures. * Fixed PRI and SS7 using an incorrect string value if the extension delimiter is not present in the Dial() function. * Fixed SS7 not checking if the dialed extension is at least as long as the stripmsd option. * Fixed PRI not handling unknown TON/NPI prefix letters correctly. * Fixed some uninitialized string variables on FXS ports. configs/chan_dahdi.conf.sample * Updated some documentation. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@172435 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-29Merged revisions 172315 via svnmerge from tilghman1-12/+23
https://origsvn.digium.com/svn/asterisk/trunk ........ r172315 | tilghman | 2009-01-29 10:48:25 -0600 (Thu, 29 Jan 2009) | 2 lines Better document mode=multirow, based upon a conversation with Jared. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@172317 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-29Merged revisions 171880 via svnmerge from oej1-1/+21
https://origsvn.digium.com/svn/asterisk/trunk ........ r171880 | oej | 2009-01-28 14:26:31 +0100 (Ons, 28 Jan 2009) | 2 lines Add some more notes about device matching. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@172218 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-28Merged revisions 171838 via svnmerge from oej1-0/+19
https://origsvn.digium.com/svn/asterisk/trunk ................ r171838 | oej | 2009-01-28 14:11:44 +0100 (Ons, 28 Jan 2009) | 10 lines Merged revisions 171837 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r171837 | oej | 2009-01-28 14:07:27 +0100 (Ons, 28 Jan 2009) | 2 lines Add a better explanation of the difference between the device namespace and the dialplan for newbies. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@171857 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-24Merged revisions 170837 via svnmerge from tilghman1-5/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r170837 | tilghman | 2009-01-24 07:55:53 -0600 (Sat, 24 Jan 2009) | 9 lines Merged revisions 170836 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170836 | tilghman | 2009-01-24 07:55:02 -0600 (Sat, 24 Jan 2009) | 2 lines Remove superfluous implementation note (closes issue #14319) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170839 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-23Merged revisions 170720 via svnmerge from mmichelson1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r170720 | mmichelson | 2009-01-23 14:56:07 -0600 (Fri, 23 Jan 2009) | 16 lines Merged revisions 170719 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170719 | mmichelson | 2009-01-23 14:55:26 -0600 (Fri, 23 Jan 2009) | 8 lines Add notes to the idlecheck explanation in res_odbc.conf.sample (closes issue #14319) Reported by: klaus3000 Patches: patch_idlecheck_res_odbc.conf.sample.txt uploaded by klaus3000 (license 65) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170722 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-17Add discriminator for when ring pulse alert signal is used to preface MWI spillsdbailey1-6/+14
This prevents the situation when MWI messages are added to caller ID spills causing the channel to be hung up git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169154 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-15Merged revisions 168722 via svnmerge from oej1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r168722 | oej | 2009-01-15 19:47:14 +0100 (Tor, 15 Jan 2009) | 10 lines Merged revisions 168721 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168721 | oej | 2009-01-15 19:43:43 +0100 (Tor, 15 Jan 2009) | 2 lines Meetme actually has realtime but wasn't documented ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168727 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-15Merged revisions 168711 via svnmerge from oej1-4/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r168711 | oej | 2009-01-15 18:55:53 +0100 (Tor, 15 Jan 2009) | 4 lines Clarify some misunderstandings and make it even more clear that you can refer to a peer in the register= line. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168715 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-12Merged revisions 168481 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r168481 | russell | 2009-01-12 08:57:49 -0600 (Mon, 12 Jan 2009) | 10 lines Merged revisions 168480 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168480 | russell | 2009-01-12 08:57:27 -0600 (Mon, 12 Jan 2009) | 2 lines s/ringdance/ringcadence/ for Bulgaria ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168484 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-07Merged revisions 167477 via svnmerge from lmadsen1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r167477 | lmadsen | 2009-01-07 13:18:45 -0500 (Wed, 07 Jan 2009) | 8 lines Update queues.conf.sample documentation. Update the queues.conf.sample documentation to mention that you need to preload chan_local.so as well if you plan on using Local channels for queue members, and you're preloading pbx_config.so. (closes issue #14179) Reported by: CrashHD Tested by: CrashHD ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@167491 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-11Merged revisions 163213 via svnmerge from mmichelson1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r163213 | mmichelson | 2008-12-11 14:57:44 -0600 (Thu, 11 Dec 2008) | 9 lines Add an option to voicemail.conf to allow urgent messages to be forwarded as not urgent. (closes issue #14063) Reported by: jaroth Patches: urgfwd_v2.patch uploaded by jaroth (license 50) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@163214 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-09Merged revisions 155671 via svnmerge from seanbright1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r155671 | seanbright | 2008-11-09 11:30:29 -0500 (Sun, 09 Nov 2008) | 1 line Fix this as well. Pointed out by tzafrir. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155672 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-07Merged revisions 155360 via svnmerge from mmichelson1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r155360 | mmichelson | 2008-11-07 15:14:49 -0600 (Fri, 07 Nov 2008) | 8 lines Remove one more instance of the sample configuration lying about what's possible. The tz cannot be set in a context like this. It can only be set in the general section or per-mailbox. Thanks to sasargen on #asterisk-dev for pointing this out ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155362 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-06Merged revisions 155012 via svnmerge from mmichelson1-2/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r155012 | mmichelson | 2008-11-06 13:46:53 -0600 (Thu, 06 Nov 2008) | 16 lines Merged revisions 155011 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r155011 | mmichelson | 2008-11-06 13:45:52 -0600 (Thu, 06 Nov 2008) | 8 lines The documentation listed the ability to set 'maxmsg' per context. The truth is that you can only set this in the general section or per mailbox. Thus I am updating the sample config file to be more accurate. Thanks to sasargen on IRC for bringing up this issue. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@155014 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-30Merged revisions 152765 via svnmerge from tilghman1-39/+43
https://origsvn.digium.com/svn/asterisk/trunk ........ r152765 | tilghman | 2008-10-29 23:26:34 -0500 (Wed, 29 Oct 2008) | 5 lines Set up an example stdexten that preserves the original context and extension in the CDR. (Related to issue #13799) Reported by: davidw ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@152777 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-29Merged revisions 152605 via svnmerge from murf1-6/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r152605 | murf | 2008-10-28 23:47:13 -0600 (Tue, 28 Oct 2008) | 22 lines Merged revisions 152538 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r152538 | murf | 2008-10-28 23:19:04 -0600 (Tue, 28 Oct 2008) | 14 lines A little documentation cross-ref between features and dial and queue... I wasted some time (stupidly) trying to get the one-touch parking stuff working, because it didn't occur to me that I had to also have the corresponding options in the dial command! Duh! (In all this time, I never set this up before!) So, to keep some poor fool from suffering the same fate, I made the features.conf.sample file mention the corresponding opts in dial/queue; and the docs for dial/app specifically mention the corresponding decls in the feature.conf file. I hope this doesn't spoil some vast, eternal plan... ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@152606 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-15Merged revisions 149756 via svnmerge from bweschke1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r149756 | bweschke | 2008-10-15 16:14:20 -0400 (Wed, 15 Oct 2008) | 10 lines Merged revisions 149683 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r149683 | bweschke | 2008-10-15 14:28:54 -0400 (Wed, 15 Oct 2008) | 4 lines An update to the documentation/example of agents.conf.sample with the correct parameter for this feature as defined in chan_agent.c (closes issue #13709) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@149758 f38db490-d61c-443f-a65b-d21fe96a405b