aboutsummaryrefslogtreecommitdiffstats
path: root/main
AgeCommit message (Collapse)AuthorFilesLines
2010-03-02Merged revisions 249893 via svnmerge from dvossel1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r249893 | dvossel | 2010-03-02 13:08:38 -0600 (Tue, 02 Mar 2010) | 11 lines fixes adaptive jitterbuffer configuration When configuring the adaptive jitterbuffer, the target_extra value not only could not be set from the configuration, but was not even being set to its proper default. This value is required in order for the adaptive jitterbuffer to work correctly. To resolve this a config option has been added to expose this value to the conf files, and a default value is provided when no config specific value is present. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@249907 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-25Merged revisions 248946 via svnmerge from mmichelson1-1/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r248946 | mmichelson | 2010-02-25 16:41:48 -0600 (Thu, 25 Feb 2010) | 5 lines Fix incorrect ACL behavior when CIDR notation of "/0" is used. AST-2010-003 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@248947 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-25Merged revisions 248861 via svnmerge from tilghman1-0/+12
https://origsvn.digium.com/svn/asterisk/trunk ................ r248861 | tilghman | 2010-02-25 15:22:39 -0600 (Thu, 25 Feb 2010) | 22 lines Merged revisions 248859 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r248859 | tilghman | 2010-02-25 15:21:05 -0600 (Thu, 25 Feb 2010) | 15 lines Some platforms clear /var/run at boot, which makes connecting a remote console... difficult. Previously, we only created the default /var/run/asterisk directory at install time. While we could create it in the init script, that would not work for those who start asterisk manually from the command line. So the safest thing to do is to create it as part of the Asterisk boot process. This also changes the ownership of the directory, because the pid and ctl files are created after we setuid/setgid. (closes issue #16802) Reported by: Brian Patches: 20100224__issue16802.diff.txt uploaded by tilghman (license 14) Tested by: tzafrir ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@248862 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-24Merged revisions 248584 via svnmerge from tilghman1-3/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r248584 | tilghman | 2010-02-24 15:17:26 -0600 (Wed, 24 Feb 2010) | 14 lines Merged revisions 248582 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r248582 | tilghman | 2010-02-24 15:02:18 -0600 (Wed, 24 Feb 2010) | 7 lines Remove color code sequences from verbose messages that go to logfiles. (closes issue #16786) Reported by: dodo Patches: logger2.patch uploaded by dodo (license 989) Tested by: tilghman ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@248613 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-19Merged revisions 228798 via svnmerge from tilghman1-17/+30
https://origsvn.digium.com/svn/asterisk/trunk (closes issue #16470) Reported by: kjotte ........ r228798 | tilghman | 2009-11-09 01:37:52 -0600 (Mon, 09 Nov 2009) | 14 lines Fix various problems detected with Valgrind. * chan_console accessed pvts after deallocation. * The module loader did not check usecount on shutdown, which led to chan_iax2 reading a timer that was already unloaded. (closes issue #16062) Reported by: alexanderheinz Patches: 20091109__issue16062.diff.txt uploaded by tilghman (license 14) Tested by: tilghman ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@248008 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-19Restore generated file from flex sourcetilghman1-62/+115
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@247933 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-19Restore fwrite() line so ast_expr2f.c can compile.rmudgett1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@247919 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-18Merged revisions 247652 via svnmerge from mnicholson1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r247652 | mnicholson | 2010-02-18 13:39:37 -0600 (Thu, 18 Feb 2010) | 13 lines Merged revisions 247651 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r247651 | mnicholson | 2010-02-18 13:38:09 -0600 (Thu, 18 Feb 2010) | 6 lines Copy the calling party's account code to the called party if they don't already have one. (closes issue #16331) Reported by: bluefox Tested by: mnicholson ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@247655 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-17Merged revisions 247335 via svnmerge from mmichelson1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r247335 | mmichelson | 2010-02-17 15:22:40 -0600 (Wed, 17 Feb 2010) | 20 lines Fix two problems in ast_str functions found while writing a unit test. 1. The documentation for ast_str_set and ast_str_append state that the max_len parameter may be -1 in order to limit the size of the ast_str to its current allocated size. The problem was that the max_len parameter in all cases was a size_t, which is unsigned. Thus a -1 was interpreted as UINT_MAX instead of -1. Changing the max_len parameter to be ssize_t fixed this issue. 2. Once issue 1 was fixed, there was an off-by-one error in the case where we attempted to write a string larger than the current allotted size to a string when -1 was passed as the max_len parameter. When trying to write more than the allotted size, the ast_str's __AST_STR_USED was set to 1 higher than it should have been. Thanks to Tilghman for quickly spotting the offending line of code. Oh, and the unit test that I referenced in the top line of this commit will be added to reviewboard shortly. Sit tight... ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@247338 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-16Merged revisions 246980 via svnmerge from dvossel1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r246980 | dvossel | 2010-02-16 14:54:48 -0600 (Tue, 16 Feb 2010) | 8 lines warning message if openssl support is missing while attempting tls connection (closes issue #16673) Reported by: michaesc Patches: tls_error_msg.diff uploaded by dvossel (license 671) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@246984 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-16Merged revisions 246899 via svnmerge from dvossel1-8/+31
https://origsvn.digium.com/svn/asterisk/trunk ........ r246899 | dvossel | 2010-02-16 11:07:41 -0600 (Tue, 16 Feb 2010) | 16 lines fixes sample rate conversion issue with Monitor application When using ast_seekstream with the read/write streams of a monitor, the number of samples we are seeking must be of the same rate as the stream or the jump calculation will be incorrect. This patch adds logic to correctly convert the number of samples to jump to the sample rate the read/write stream is using. For example, if the call is G722 (16khz) and the read/write stream is recording a 8khz wav, seeking 320 samples of 16khz audio is not the same as seeking 320 samples of 8khz audio when performing the ast_seekstream on the stream. ABE-2044 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@246903 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-12Merged revisions 246546 via svnmerge from dvossel1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r246546 | dvossel | 2010-02-12 17:32:33 -0600 (Fri, 12 Feb 2010) | 21 lines Merged revisions 246545 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r246545 | dvossel | 2010-02-12 17:30:17 -0600 (Fri, 12 Feb 2010) | 16 lines lock channel during datastore removal On channel destruction the channel's datastores are removed and destroyed. Since there are public API calls to find and remove datastores on a channel, a lock should be held whenever datastores are removed and destroyed. This resolves a crash caused by a race condition in app_chanspy.c. (closes issue #16678) Reported by: tim_ringenbach Patches: datastore_destroy_race.diff uploaded by tim ringenbach (license 540) Tested by: dvossel ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@246549 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-12Fix some silly formatting that made my head hurt.qwell1-6/+6
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@246462 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-08Merged revisions 245578 via svnmerge from tilghman1-3/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r245578 | tilghman | 2010-02-08 16:31:40 -0600 (Mon, 08 Feb 2010) | 12 lines Actually use _ASTLDFLAGS in the main/ and channels/ Makefiles. They were previously passed correctly, but they simply weren't used. This caused issues with various platforms whose builds needed to pass special linker flags via the configure script. (closes issue #16596) Reported by: pprindeville Patches: asterisk-1.6-astldflags.patch uploaded by pprindeville (license 347) Tested by: tilghman ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@245579 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-08Merged revisions 245497 via svnmerge from qwell2-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r245497 | qwell | 2010-02-08 14:41:05 -0600 (Mon, 08 Feb 2010) | 11 lines Merged revisions 245496 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r245496 | qwell | 2010-02-08 14:39:50 -0600 (Mon, 08 Feb 2010) | 4 lines Remove reference of documentation in source directory. People don't always build Asterisk from source (distro packages, anybody?). ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@245498 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-05Merged revisions 244927 via svnmerge from seanbright1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r244927 | seanbright | 2010-02-05 12:05:32 -0500 (Fri, 05 Feb 2010) | 9 lines Merged revisions 244926 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r244926 | seanbright | 2010-02-05 12:03:35 -0500 (Fri, 05 Feb 2010) | 1 line Update main copyright date. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@244928 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-02Merged revisions 244443 via svnmerge from dvossel1-5/+31
https://origsvn.digium.com/svn/asterisk/trunk ........ r244443 | dvossel | 2010-02-02 16:27:23 -0600 (Tue, 02 Feb 2010) | 18 lines fixes crash during T.38 negotiation caused by invalid or missing FaxMaxDatagram field AST-2010-001 (closes issue #16634) Reported by: krn (closes issue #16724) Reported by: barthpbx (closes issue #16517) Reported by: bklang (closes issue #16485) Reported by: elsto ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@244447 f38db490-d61c-443f-a65b-d21fe96a405b
2010-02-01Merged revisions 244071 via svnmerge from tilghman1-15/+15
https://origsvn.digium.com/svn/asterisk/trunk ................ r244071 | tilghman | 2010-02-01 11:53:39 -0600 (Mon, 01 Feb 2010) | 22 lines Merged revisions 244070 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r244070 | tilghman | 2010-02-01 11:46:31 -0600 (Mon, 01 Feb 2010) | 16 lines Revert previous chan_local fix (r236981) and fix instead by destroying expired frames in the queue. (closes issue #16525) Reported by: kobaz Patches: 20100126__issue16525.diff.txt uploaded by tilghman (license 14) 20100129__issue16525__1.6.0.diff.txt uploaded by tilghman (license 14) Tested by: kobaz, atis (closes issue #16581) Reported by: ZX81 (closes issue #16681) Reported by: alexr1 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@244072 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-28Ensure manager hooks are executed when there are no manager sessions.jpeeler1-20/+24
Conditional expanded to check for hooks before aborting manager event processing. The other two changes are just optimizations. (closes issue #16455) Reported by: atis Patches: manager_hooks_16.patch uploaded by atis (license 242) Tested by: atis git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@243987 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-27Merged revisions 243487 via svnmerge from mmichelson1-2/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r243487 | mmichelson | 2010-01-27 12:08:02 -0600 (Wed, 27 Jan 2010) | 9 lines Merged revisions 243486 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r243486 | mmichelson | 2010-01-27 12:06:43 -0600 (Wed, 27 Jan 2010) | 3 lines Use a safe list traversal while checking for duplicate vars in pbx_builtin_setvar_helper. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@243488 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-27Merged revisions 243391 via svnmerge from dvossel1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r243391 | dvossel | 2010-01-26 17:56:57 -0600 (Tue, 26 Jan 2010) | 15 lines Merged revisions 243390 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r243390 | dvossel | 2010-01-26 17:55:49 -0600 (Tue, 26 Jan 2010) | 9 lines fixes bug with channel receiving wrong privileges after call parking (closes issue #16429) Reported by: Yasuhiro Konishi Patches: features.c.diff uploaded by Yasuhiro Konishi (license 947) Tested by: dvossel ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@243394 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-26Merged revisions 243266 via svnmerge from jpeeler1-11/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r243266 | jpeeler | 2010-01-26 12:20:55 -0600 (Tue, 26 Jan 2010) | 9 lines Merged revisions 243258 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r243258 | jpeeler | 2010-01-26 12:19:10 -0600 (Tue, 26 Jan 2010) | 2 lines Remove unnecessary code in ast_read as issue 16058 has been fully solved now. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@243286 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-25Merged revisions 239920 via svnmerge from tilghman1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r239920 | tilghman | 2010-01-13 14:38:42 -0600 (Wed, 13 Jan 2010) | 2 lines Flex uses fwrite incorrectly, which breaks the build. Providing a workaround. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@243060 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-25Merged revisions 242967,242971 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r242967 | tilghman | 2010-01-25 15:38:33 -0600 (Mon, 25 Jan 2010) | 9 lines Merged revisions 242966 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242966 | tilghman | 2010-01-25 15:36:33 -0600 (Mon, 25 Jan 2010) | 2 lines Only rebuild parsers by an option in menuselect ........ ................ r242971 | tilghman | 2010-01-25 15:51:41 -0600 (Mon, 25 Jan 2010) | 9 lines Merged revisions 242969 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242969 | tilghman | 2010-01-25 15:50:22 -0600 (Mon, 25 Jan 2010) | 2 lines Err, and use the new menuselect define, too. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242972 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-25Merged revisions 242904 via svnmerge from oej2-81/+39
https://origsvn.digium.com/svn/asterisk/trunk ................ r242904 | oej | 2010-01-25 21:27:59 +0100 (Mån, 25 Jan 2010) | 10 lines Merged revisions 242850 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242850 | oej | 2010-01-25 21:03:38 +0100 (Mån, 25 Jan 2010) | 2 lines Report error when writing to functions returns error in AMI setvar action ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242915 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-25Merged revisions 242857 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r242857 | tilghman | 2010-01-25 14:18:15 -0600 (Mon, 25 Jan 2010) | 9 lines Merged revisions 242852 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242852 | tilghman | 2010-01-25 14:15:45 -0600 (Mon, 25 Jan 2010) | 2 lines Restore FreeBSD to able-to-compile-ish-mode ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242885 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-25Merged revisions 242729 via svnmerge from tilghman1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r242729 | tilghman | 2010-01-24 23:45:00 -0600 (Sun, 24 Jan 2010) | 9 lines Merged revisions 242728 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242728 | tilghman | 2010-01-24 23:42:22 -0600 (Sun, 24 Jan 2010) | 2 lines Buildbot pointed out an error (thanks, buildbot!) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242730 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-25Merged revisions 242719 via svnmerge from tilghman1-8/+18
https://origsvn.digium.com/svn/asterisk/trunk ................ r242719 | tilghman | 2010-01-24 23:30:33 -0600 (Sun, 24 Jan 2010) | 9 lines Merged revisions 242683 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242683 | tilghman | 2010-01-24 23:13:28 -0600 (Sun, 24 Jan 2010) | 2 lines Make the build of the Asterisk expression parser match that of the AEL parser. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242720 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-24Ensure that the priority is set to 0 on the astcanary thread.kmoore1-0/+1
This was causing asterisk to exit erroneously while polling to ensure that it had a proper DAHDI timing source. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242603 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-22Add Dialed Number Identifier (DNID) field to cdr.alecdavis1-0/+1
Branch support, retains ABI, if backend CDR collector is adaptive then database requires 'dnid' field to be added, otherwise no functional changes. Reported by: alecdavis Tested by: alecdavis Patch cdr_dnid.diff2.txt uploaded by alecdavis (license 585) Review: https://reviewboard.asterisk.org/r/455/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242141 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-20Merged revisions 241714 via svnmerge from dvossel1-18/+6
https://origsvn.digium.com/svn/asterisk/trunk ........ r241714 | dvossel | 2010-01-20 15:14:47 -0600 (Wed, 20 Jan 2010) | 10 lines rtp timestamp to timeval calculation fix The rtp timestamp to timeval calculation was only accurate for 8kHz audio. This patch corrects this. Review: https://reviewboard.asterisk.org/r/468/ SWP-648 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@241758 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-20Update CDR variables as pbx startsalecdavis1-0/+4
Allows CDR variables added in cdr.c:set_one_cid to become visable during the call, by executing ast_cdr_update() early in __ast_pbx_run. Based on cdr_update.diff3.txt (issue #16638) Reported by: alecdavis Patches: cdr_update.diff3.txt uploaded by alecdavis (license 585) Tested by: alecdavis git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@241457 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-19Merged revisions 241366 via svnmerge from jpeeler1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r241366 | jpeeler | 2010-01-19 16:59:53 -0600 (Tue, 19 Jan 2010) | 13 lines Initialize data on the stack so that Park doesn't interpret random arguments. passdata was only being set in pbx_substitue_variables when arguments were passed. (closes issue #16406) (closes issue #16586) Reported by: DLNoah Patches: bug16586v2.patch uploaded by jpeeler (license 325) Tested by: DLNoah ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@241367 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-18Merged revisions 241016 via svnmerge from seanbright1-22/+18
https://origsvn.digium.com/svn/asterisk/trunk ................ r241016 | seanbright | 2010-01-18 14:57:52 -0500 (Mon, 18 Jan 2010) | 19 lines Merged revisions 241015 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r241015 | seanbright | 2010-01-18 14:54:19 -0500 (Mon, 18 Jan 2010) | 12 lines Plug a memory leak when reading configs with their comments. While reading through configuration files with the intent of returning their full contents (comments specifically) we allocated some memory and then forgot to free it. This doesn't fix 16554 but clears up a leak I had in the lab. (issue #16554) Reported by: mav3rick Patches: issue16554_20100118.patch uploaded by seanbright (license 71) Tested by: seanbright ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@241017 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-17Merged revisions 240717 via svnmerge from seanbright1-1/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r240717 | seanbright | 2010-01-17 14:45:48 -0500 (Sun, 17 Jan 2010) | 5 lines Avoid a crash on Solaris when running 'core show functions.' (closes issue #16309) Reported by: asgaroth ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@240718 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-16Merged revisions 239665 via svnmerge from tilghman1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r239665 | oej | 2010-01-13 04:45:19 -0600 (Wed, 13 Jan 2010) | 2 lines MAX() moved to utils.h ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@240666 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-15Merged revisions 240499-240500 via svnmerge from tilghman1-16/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r240499 | tilghman | 2010-01-15 15:40:14 -0600 (Fri, 15 Jan 2010) | 9 lines The previous attempt at using a pipe to guarantee astcanary shutdown did not work. We're revisiting the previous patch, albeit with a method that overcomes the prior criticism that it was not POSIX-compliant. (closes issue #16602) Reported by: frawd Patches: 20100114__issue16602.diff.txt uploaded by tilghman (license 14) Tested by: frawd ........ r240500 | tilghman | 2010-01-15 15:42:36 -0600 (Fri, 15 Jan 2010) | 2 lines Oops, missed an include ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@240501 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-14Merged revisions 240175 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r240175 | tilghman | 2010-01-14 11:34:53 -0600 (Thu, 14 Jan 2010) | 2 lines Similarly, ensure that matchcid is duplicated correctly when merging contexts. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@240176 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-14Merged revisions 240078 via svnmerge from mnicholson1-3/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r240078 | mnicholson | 2010-01-14 10:14:35 -0600 (Thu, 14 Jan 2010) | 9 lines This change fixes a few bugs in the way the far max IFP was calculated that were introduced in r231692. (closes issue #16497) Reported by: globalnetinc Patches: udptl-max-ifp-fix1.diff uploaded by mnicholson (license 96) Tested by: globalnetinc ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@240092 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-13Merged revisions 239839 via svnmerge from jpeeler1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r239839 | jpeeler | 2010-01-13 13:48:16 -0600 (Wed, 13 Jan 2010) | 18 lines Merged revisions 239838 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r239838 | jpeeler | 2010-01-13 13:43:33 -0600 (Wed, 13 Jan 2010) | 11 lines Fix regression for timed out parked call returning to caller This issue seems to have been exposed by the fix in 160390 whereby using a masquerade prevented a crash. The new channel used in the masquerade was not copying the macro information from the old channel. (closes issue #15459) Reported by: djrodman Patches: patch_15459.txt uploaded by mnick (license ) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@239842 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-13Merged revisions 239712 via svnmerge from dvossel1-7/+25
https://origsvn.digium.com/svn/asterisk/trunk ........ r239712 | dvossel | 2010-01-13 10:31:14 -0600 (Wed, 13 Jan 2010) | 24 lines add silence gen to wait apps asterisk.conf's 'transmit_silence' option existed before this patch, but was limited to only generating silence while recording and sending DTMF. Now enabling the transmit_silence option generates silence during wait times as well. To achieve this, ast_safe_sleep has been modified to generate silence anytime no other generators are present and transmit_silence is enabled. Wait apps not using ast_safe_sleep now generate silence when transmit_silence is enabled as well. (closes issue #16524) Reported by: kobaz (closes issue #16523) Reported by: kobaz Tested by: dvossel Review: https://reviewboard.asterisk.org/r/456/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@239716 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-12Merged revisions 239571 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r239571 | tilghman | 2010-01-12 13:58:00 -0600 (Tue, 12 Jan 2010) | 5 lines Blank callerid and NULL callerid should not compare equal. The second is the default state for matching CID in the dialplan (no matching) while the first matches one particular CallerID. This is a regression. (fixes AST-314, SWP-611) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@239573 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-09Merged revisions 238916 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r238916 | tilghman | 2010-01-08 19:08:04 -0600 (Fri, 08 Jan 2010) | 13 lines Merged revisions 238915 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r238915 | tilghman | 2010-01-08 18:57:58 -0600 (Fri, 08 Jan 2010) | 6 lines -1 is interpreted as an error, intead of the maximum mask. (closes issue #16241) Reported by: vnovy Patches: manager.c.patch uploaded by vnovy (license 922) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@238968 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-08Merged revisions 238835 via svnmerge from jpeeler1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r238835 | jpeeler | 2010-01-08 17:30:55 -0600 (Fri, 08 Jan 2010) | 11 lines Merged revisions 238834 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r238834 | jpeeler | 2010-01-08 17:28:37 -0600 (Fri, 08 Jan 2010) | 4 lines Stop a crash when no peer is passed to masq_park_call. (distantly related to issue #16406) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@238836 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-08Merged revisions 238635 via svnmerge from dvossel1-1/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r238635 | dvossel | 2010-01-08 13:39:30 -0600 (Fri, 08 Jan 2010) | 22 lines fixes AUDIOHOOK_INHERIT regression During the process of removing an audiohook from one channel and attaching it to another the audiohook's status is updated to DONE and then back to whatever it was previously. Typically updating the status after setting it to DONE is not a good idea because DONE can trigger unrecoverable audiohook destruction events... because of this a conditional check was added to audiohook_update_status to explicitly prevent the audiohook from ever changing after being set to DONE. It was this check that prevented audiohook inherit from work properly though. Now ast_audiohook_move_by_source is treated as a special exception, as the audiohook must be returned to its previous status after attaching it to the new channel. This is only a safe operation because the audiohook's lock is held the entire time, otherwise this could cause trouble. (closes issue #16522) Reported by: corruptor ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@238639 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-08Merged revisions 238630 via svnmerge from mnicholson1-4/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r238630 | mnicholson | 2010-01-08 13:32:11 -0600 (Fri, 08 Jan 2010) | 12 lines Merged revisions 238629 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r238629 | mnicholson | 2010-01-08 13:20:44 -0600 (Fri, 08 Jan 2010) | 5 lines Properly calculate the remaining space in the output string when reducing format strings. (closes issue #16560) Reported by: goldwein ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@238633 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-07Merged revisions 209400 via svnmerge from tilghman1-8/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r209400 | kpfleming | 2009-07-28 08:49:46 -0500 (Tue, 28 Jul 2009) | 3 lines Define side-effect-safe MIN and MAX macros and remove duplicate definitions from various files. (closes issue #16251) Reported by: asgaroth ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@238494 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-06Merged revisions 238134 via svnmerge from jpeeler1-3/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r238134 | jpeeler | 2010-01-06 13:05:06 -0600 (Wed, 06 Jan 2010) | 10 lines Fix channel name comparison for bridge application. The channel name comparison was not comparing the whole string and therefore if one channel name was a substring of the other, the bridge would fail. (closes issue #16528) Reported by: telecos82 Patches: res_features_r236843.diff uploaded by telecos82 (license 687) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@238135 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-05Merged revisions 237839 via svnmerge from dvossel1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r237839 | dvossel | 2010-01-05 13:29:47 -0600 (Tue, 05 Jan 2010) | 19 lines fixes subscriptions being lost after 'module reload' During a module reload if multiple extension configs are present, such as both extensions.conf and extensions.ael, watchers for one config's hints will be lost during the merging of the other config. This happens because hint watchers are only preserved for the current config being merged. The old context list is destroyed after the merging takes place, meaning any watchers that were not perserved will be removed. Now all hints are preserved during merging regardless of what config file is being merged. These hints are only restored if they are present within the new context list. (closes issue #16093) Reported by: jlaroff ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@237843 f38db490-d61c-443f-a65b-d21fe96a405b
2010-01-05Merged revisions 237699 via svnmerge from russell1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r237699 | russell | 2010-01-05 11:16:01 -0600 (Tue, 05 Jan 2010) | 14 lines Merged revisions 237697 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r237697 | russell | 2010-01-05 11:13:28 -0600 (Tue, 05 Jan 2010) | 7 lines Change a NOTICE log message to DEBUG where it belongs. (closes issue #16479) Reported by: alexrecarey (closes SWP-577) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@237712 f38db490-d61c-443f-a65b-d21fe96a405b