aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2011-01-17Create 1.6.1.21 tag from 1.6.1.20.v1.6.1.21@302138lmadsen0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/1.6.1.21@302113 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-17Update ChangeLog and .version. Snap yo.v1.6.1.20lmadsen2-1/+9
Shoutouts to russellb and Mac Daddy G. git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.1.20@263586 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-17Copy 1.6.1.20-rc2 to 1.6.1.20, the final release in the 1.6.1 branch.lmadsen0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.1.20@263584 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-13Use autotagged externalsv1.6.1.20-rc2lmadsen0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.1.20-rc2@262986 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-13Importing files for 1.6.1.20-rc2 release.lmadsen3-0/+66233
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.1.20-rc2@262985 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-13Creating tag for the release of asterisk-1.6.1.20-rc2lmadsen0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.1.20-rc2@262984 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-12Merged revisions 262800 via svnmerge from pabelanger2-1/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r262800 | pabelanger | 2010-05-12 15:59:16 -0400 (Wed, 12 May 2010) | 8 lines Notify CLI when modules is loaded / unloaded (closes issue #17308) Reported by: pabelanger Patches: cli.modules.patch uploaded by pabelanger (license 224) Tested by: pabelanger, russell ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262802 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-12Merged revisions 262744 via svnmerge from dvossel1-5/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r262744 | dvossel | 2010-05-12 13:01:20 -0500 (Wed, 12 May 2010) | 17 lines Merged revisions 262662 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r262662 | dvossel | 2010-05-12 12:00:04 -0500 (Wed, 12 May 2010) | 11 lines fixes app_meetme dsp error We attempted to detect silence after translating a frame from signed linear. This caused a flooding of errors. To resolve this the code to detect silence was moved before the translation. (closes issue #17133) Reported by: jsdyer ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262747 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-12Merged revisions 262656 via svnmerge from tilghman1-30/+39
https://origsvn.digium.com/svn/asterisk/trunk ........ r262656 | tilghman | 2010-05-12 11:23:26 -0500 (Wed, 12 May 2010) | 8 lines Ensure the arguments are initialized. Also miscellaneous CG cleanup. (closes issue #16576) Reported by: uxbod Patches: 20100505__issue16576.diff.txt uploaded by tilghman (license 14) Tested by: uxbod ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262658 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-11Merged revisions 262513 via svnmerge from tilghman1-99/+107
https://origsvn.digium.com/svn/asterisk/trunk ........ r262513 | tilghman | 2010-05-11 16:25:05 -0500 (Tue, 11 May 2010) | 7 lines Move cause 200 to cause 26, as specified in Q.850. Also cleanup the formatting and add a few more that seem like good candidates. (closes issue #16157) Reported by: wimpy ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262515 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-11Merged revisions 262419 via svnmerge from pabelanger1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r262419 | pabelanger | 2010-05-11 15:40:37 -0400 (Tue, 11 May 2010) | 8 lines Improve logging by displaying line number (closes issue #16303) Reported by: dant Patches: issue16303.patch.v2 uploaded by pabelanger (license 224) Tested by: dant, lmadsen, pabelanger ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262426 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-11Merged revisions 262422 via svnmerge from qwell1-2/+6
https://origsvn.digium.com/svn/asterisk/trunk ................ r262422 | qwell | 2010-05-11 14:57:24 -0500 (Tue, 11 May 2010) | 18 lines Merged revisions 262421 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r262421 | qwell | 2010-05-11 14:55:42 -0500 (Tue, 11 May 2010) | 11 lines Use a less silly method for modifying a flex-generated file. The sed syntax that was used wasn't actually valid, causing some versions to choke. This is the method that is used in 1.6.x+ for similar changes. (closes issue #16696) Reported by: bklang Patches: 16696-sedfix.diff uploaded by qwell (license 4) Tested by: qwell ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262424 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-11Merged revisions 262414 via svnmerge from pabelanger1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r262414 | pabelanger | 2010-05-11 15:26:17 -0400 (Tue, 11 May 2010) | 8 lines Improve logging information for misconfigured contexts (closes issue #17238) Reported by: pprindeville Patches: chan_sip-bug17238.patch uploaded by pprindeville (license 347) Tested by: pprindeville ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262416 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-11Merged revisions 262330 via svnmerge from tilghman2-3/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r262330 | tilghman | 2010-05-11 12:23:51 -0500 (Tue, 11 May 2010) | 9 lines Merged revisions 262321 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r262321 | tilghman | 2010-05-11 12:22:07 -0500 (Tue, 11 May 2010) | 2 lines Fix issue #17302 a slightly different way (mad props to Qwell) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262339 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-10Merged revisions 262236 via svnmerge from dvossel1-1/+8
https://origsvn.digium.com/svn/asterisk/trunk ........ r262236 | dvossel | 2010-05-10 13:36:10 -0500 (Mon, 10 May 2010) | 11 lines fixes crash in chan_console There is a race condition between console_hangup() and start_stream(). It is possible for console_hangup() to be called and then the stream thread to begin after the hangup. To avoid this a check in start_stream() to make sure the pvt-owner still exists while the pvt lock is held is made. If the owner is gone that means the channel hung up and start_stream should be aborted. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262238 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-10Merged revisions 262152 via svnmerge from tilghman1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r262152 | tilghman | 2010-05-10 11:36:25 -0500 (Mon, 10 May 2010) | 17 lines Merged revisions 262151 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r262151 | tilghman | 2010-05-10 11:34:21 -0500 (Mon, 10 May 2010) | 10 lines Allow compilation on Mac OS X 10.4 (Tiger) (closes issue #17297) Reported by: jcovert Patches: 20100506__issue17297.diff.txt uploaded by tilghman (license 14) (closes issue #17302) Reported by: jcovert ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262154 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-09Merged revisions 262102 via svnmerge from tilghman5-520/+393
https://origsvn.digium.com/svn/asterisk/trunk ........ r262102 | tilghman | 2010-05-08 21:14:04 -0500 (Sat, 08 May 2010) | 5 lines Cleanup a bit more by getting rid of useless version defines. Also make library detection use passed CFLAGS. (closes issue #17309) Reported by: stuarth ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262104 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-08Merged revisions 262048 via svnmerge from tilghman2-7/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r262048 | tilghman | 2010-05-07 21:40:01 -0500 (Fri, 07 May 2010) | 2 lines Use CPPFLAGS to pass PTHREAD_CFLAGS for vpb only ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262050 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-07Merged revisions 261913 via svnmerge from tilghman3-6511/+24141
https://origsvn.digium.com/svn/asterisk/trunk ........ r261913 | tilghman | 2010-05-07 15:35:17 -0500 (Fri, 07 May 2010) | 14 lines Use the detected pthread building flags in every place, instead of hardcoding -lpthread. We nicely detect the right flags on each system for building Asterisk with pthreads, then ignore it for every other build option that requires us to build with pthreads. This caused some items to return a false negative. Also cleanup some minor naming issues that caused "library library" redundancy in the output. (closes issue #17303) Reported by: stuarth Patches: 20100507__issue17303.diff.txt uploaded by tilghman (license 14) Tested by: stuarth ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261915 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-06Merged revisions 261736 via svnmerge from jpeeler1-1/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r261736 | jpeeler | 2010-05-06 15:11:53 -0500 (Thu, 06 May 2010) | 15 lines Merged revisions 261735 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r261735 | jpeeler | 2010-05-06 15:10:59 -0500 (Thu, 06 May 2010) | 8 lines Only allow the operator key to be accepted after leaving a voicemail. Or rather disallow the operator key from being accepted when not offered, such as after finishing a recording from within the mailbox options menu. ABE-2121 SWP-1267 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261738 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-06Merged revisions 261609 via svnmerge from qwell1-2/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r261609 | qwell | 2010-05-06 12:06:40 -0500 (Thu, 06 May 2010) | 11 lines Merged revisions 261608 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r261608 | qwell | 2010-05-06 11:56:02 -0500 (Thu, 06 May 2010) | 4 lines Use the versioned MOH tarballs, now that we have them. This makes for more reproducibility. Prompted by a discussion in #asterisk-dev ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261611 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-06Merged revisions 261560 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r261560 | tilghman | 2010-05-06 10:39:10 -0500 (Thu, 06 May 2010) | 8 lines Permit more lines within a SIP body to be parsed. The example given within the related issue showed 120 lines, which was mostly a result of the body being XML. (closes issue #17179) Reported by: khw ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261562 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-06Merged revisions 261496 via svnmerge from russell1-10/+14
https://origsvn.digium.com/svn/asterisk/trunk ........ r261496 | russell | 2010-05-06 08:58:07 -0500 (Thu, 06 May 2010) | 40 lines Fix handling of removing nodes from the middle of a heap. This bug surfaced in 1.6.2 and does not affect code in any other released version of Asterisk. It manifested itself as SIP qualify not happening when it should, causing peers to go unreachable. This was debugged down to scheduler entries sometimes not getting executed when they were supposed to, which was in turn caused by an error in the heap code. The problem only sometimes occurs, and it is due to the logic for removing an entry in the heap from an arbitrary location (not just popping off the top). The scheduler performs this operation frequently when entries are removed before they run (when ast_sched_del() is used). In a normal pop off of the top of the heap, a node is taken off the bottom, placed at the top, and then bubbled down until the max heap property is restored (see max_heapify()). This same logic was used for removing an arbitrary node from the middle of the heap. Unfortunately, that logic is full of fail. This patch fixes that by fully restoring the max heap property when a node is thrown into the middle of the heap. Instead of just pushing it down as appropriate, it first pushes it up as high as it will go, and _then_ pushes it down. Lastly, fix a minor problem in ast_heap_verify(), which is only used for debugging. If a parent and child node have the same value, that is not an error. The only error is if a parent's value is less than its children. A huge thanks goes out to cappucinoking for debugging this down to the scheduler, and then producing an ast_heap test case that demonstrated the breakage. That made it very easy for me to focus on the heap logic and produce a fix. Open source projects are awesome. (closes issue #16936) Reported by: ib2 Tested by: cappucinoking, crjw (closes issue #17277) Reported by: cappucinoking Patches: heap-fix.rev2.diff uploaded by russell (license 2) Tested by: cappucinoking, russell ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261497 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-06Merged revisions 261451 via svnmerge from tzafrir1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r261451 | tzafrir | 2010-05-06 10:27:31 +0300 (ה', 06 מאי 2010) | 4 lines When failing to configure, don't destroy 'cfg' twice Fixes a crash when some config section had an incorrect channel config. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261452 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-05Merged revisions 261314 via svnmerge from pabelanger1-3/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r261314 | pabelanger | 2010-05-05 14:43:03 -0400 (Wed, 05 May 2010) | 19 lines Merged revisions 261274 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r261274 | pabelanger | 2010-05-05 12:42:22 -0400 (Wed, 05 May 2010) | 12 lines Registration fix for SIP realtime. Make sure realtime fields are not empty. (closes issue #17266) Reported by: Nick_Lewis Patches: chan_sip.c-realtime.patch uploaded by Nick Lewis (license 657) Tested by: Nick_Lewis, sberney Review: https://reviewboard.asterisk.org/r/643/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261317 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-04Merged revisions 261095 via svnmerge from tilghman1-2/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r261095 | tilghman | 2010-05-04 18:51:52 -0500 (Tue, 04 May 2010) | 18 lines Merged revisions 261093-261094 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r261093 | tilghman | 2010-05-04 18:36:53 -0500 (Tue, 04 May 2010) | 7 lines Protect against overflow, when calculating how long to wait for a frame. (closes issue #17128) Reported by: under Patches: d.diff uploaded by under (license 914) ........ r261094 | tilghman | 2010-05-04 18:47:08 -0500 (Tue, 04 May 2010) | 2 lines Add a tiny corner case to the previous commit ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@261097 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-04Merged revisions 260924 via svnmerge from jpeeler1-7/+8
https://origsvn.digium.com/svn/asterisk/trunk ................ r260924 | jpeeler | 2010-05-04 13:51:28 -0500 (Tue, 04 May 2010) | 18 lines Merged revisions 260923 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r260923 | jpeeler | 2010-05-04 13:46:46 -0500 (Tue, 04 May 2010) | 12 lines Voicemail transfer to operator should occur immediately, not after main menu. There were two scenarios in the advanced options that while using the operator=yes and review=yes options, the transfer occurred only after exiting the main menu (after sending a reply or leaving a message for an extension). Now after the audio is processed for the reply or message the transfer occurs immediately as expected. ABE-2107 ABE-2108 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@260926 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-04Merged revisions 260802 via svnmerge from qwell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r260802 | qwell | 2010-05-04 10:49:57 -0500 (Tue, 04 May 2010) | 9 lines Merged revisions 260801 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r260801 | qwell | 2010-05-04 10:49:27 -0500 (Tue, 04 May 2010) | 1 line Fix fallout from removing from configure script. Pointed out by philipp64 on #asterisk-dev ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@260804 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-03Fix merge propsqwell0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@260745 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-03Merged revisions 260661-260662 via svnmerge from pabelanger1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r260661 | pabelanger | 2010-05-03 12:41:30 -0400 (Mon, 03 May 2010) | 10 lines non-root make install PREFIX=/tmp fails. Prepend libdir when executing mkpkgconfig allowing non-root installs to work. (closes issue #17268) Reported by: pabelanger Patches: issue17268.patch uploaded by pabelanger (license 224) Tested by: pabelanger ........ r260662 | pabelanger | 2010-05-03 12:54:41 -0400 (Mon, 03 May 2010) | 3 lines Should have removed /usr/lib/ part. Thanks Qwell. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@260741 f38db490-d61c-443f-a65b-d21fe96a405b
2010-05-03Merged revisions 260570 via svnmerge from lmadsen1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r260570 | lmadsen | 2010-05-03 09:58:23 -0500 (Mon, 03 May 2010) | 9 lines Merged revisions 260569 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r260569 | lmadsen | 2010-05-03 09:57:39 -0500 (Mon, 03 May 2010) | 1 line Minor typo pointed out by pabelanger on IRC. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@260572 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-30Merged revisions 260437 via svnmerge from jpeeler1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r260437 | jpeeler | 2010-04-30 17:36:49 -0500 (Fri, 30 Apr 2010) | 18 lines Merged revisions 260434 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r260434 | jpeeler | 2010-04-30 17:22:46 -0500 (Fri, 30 Apr 2010) | 11 lines Ensure channel state is not incorrectly set in the case of a very early answer. The needringing bit was being read in dahdi_read after answering thereby setting the state to ringing from up. This clears needringing upon answering so that is no longer possible. (closes issue #17067) Reported by: tzafrir Patches: needringing.diff uploaded by tzafrir (license 46) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@260440 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-30Merged revisions 260346 via svnmerge from mmichelson1-3/+14
https://origsvn.digium.com/svn/asterisk/trunk ................ r260346 | mmichelson | 2010-04-30 15:11:02 -0500 (Fri, 30 Apr 2010) | 24 lines Merged revisions 260345 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r260345 | mmichelson | 2010-04-30 15:08:15 -0500 (Fri, 30 Apr 2010) | 18 lines Fix potential crash from race condition due to accessing channel data without the channel locked. In res_musiconhold.c, there are several places where a channel's stream's existence is checked prior to calling ast_closestream on it. The issue here is that in several cases, the channel was not locked while checking the stream. The result was that if two threads checked the state of the channel's stream at approximately the same time, then there could be a situation where both threads attempt to call ast_closestream on the channel's stream. The result here is that the refcount for the stream would go below 0, resulting in a crash. I have added proper channel locking to res_musiconhold.c to ensure that we do not try to check chan->stream without the channel locked. A Digium customer has been using this patch for several weeks and has not had any crashes since applying the patch. ABE-2147 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@260354 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-29Merged revisions 260231 via svnmerge from rmudgett1-12/+22
https://origsvn.digium.com/svn/asterisk/trunk ................ r260231 | rmudgett | 2010-04-29 17:44:14 -0500 (Thu, 29 Apr 2010) | 33 lines Merged revisions 260195 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r260195 | rmudgett | 2010-04-29 17:11:47 -0500 (Thu, 29 Apr 2010) | 26 lines DTMF CallerID detection problems. The code handling DTMF CallerID drops digits on long CallerID numbers and may timeout waiting for the first ring with shorter numbers. The DTMF emulation mode was not turned off when processing DTMF CallerID. When the emulation code gets behind in processing the DTMF digits it can skip a digit. For shorter numbers, the timeout may have been too short. I increased it from 2 seconds to 4 seconds. Four seconds is a typical time between rings for many countries. (closes issue #16460) Reported by: sum Patches: issue16460.patch uploaded by rmudgett (license 664) issue16460_v1.6.2.patch uploaded by rmudgett (license 664) Tested by: sum, rmudgett Review: https://reviewboard.asterisk.org/r/634/ JIRA SWP-562 JIRA AST-334 JIRA SWP-901 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@260233 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-29Merged revisions 260148 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r260148 | tilghman | 2010-04-29 13:15:57 -0500 (Thu, 29 Apr 2010) | 2 lines Pattern match fail. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@260154 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-29Merged revisions 260050 via svnmerge from dvossel2-14/+44
https://origsvn.digium.com/svn/asterisk/trunk ................ r260050 | dvossel | 2010-04-29 10:33:27 -0500 (Thu, 29 Apr 2010) | 21 lines Merged revisions 260049 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r260049 | dvossel | 2010-04-29 10:31:02 -0500 (Thu, 29 Apr 2010) | 14 lines Fixes crash in audiohook_write_list The middle_frame in the audiohook_write_list function was being freed if a audiohook manipulator returned a failure. This is incorrect logic. This patch resolves this and adds detailed descriptions of how this function should work and why manipulator failures must be ignored. (closes issue #17052) Reported by: dvossel Tested by: dvossel (closes issue #16196) Reported by: atis Review: https://reviewboard.asterisk.org/r/623/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@260052 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-28Merged revisions 259957 via svnmerge from mmichelson1-3/+7
https://origsvn.digium.com/svn/asterisk/trunk ........ r259957 | mmichelson | 2010-04-28 17:34:15 -0500 (Wed, 28 Apr 2010) | 11 lines Don't override peer context with domain context. (closes issue #17040) Reported by: pprindeville Patches: asterisk-1.6-bugid17040.patch uploaded by pprindeville (license 347) Tested by: pprindeville Review: https://reviewboard.asterisk.org/r/565/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259958 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-28Merged revisions 259870 via svnmerge from dvossel2-10/+16
https://origsvn.digium.com/svn/asterisk/trunk ................ r259870 | dvossel | 2010-04-28 16:20:03 -0500 (Wed, 28 Apr 2010) | 39 lines Merged revisions 259858 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259858 | dvossel | 2010-04-28 16:16:03 -0500 (Wed, 28 Apr 2010) | 33 lines resolves deadlocks in chan_local Issue_1. In the local_hangup() 3 locks must be held at the same time... pvt, pvt->chan, and pvt->owner. Proper deadlock avoidance is done when the channel to hangup is the outbound chan_local channel, but when it is not the outbound channel we have an issue... We attempt to do deadlock avoidance only on the tech pvt, when both the tech pvt and the pvt->owner are locked coming into that loop. By never giving up the pvt->owner channel deadlock avoidance is not entirely possible. This patch resolves that by doing deadlock avoidance on both the pvt->owner and the pvt when trying to get the pvt->chan lock. Issue_2. ast_prod() is used in ast_activate_generator() to queue a frame on the channel and make the channel's read function get called. This function is used in ast_activate_generator() while the channel is locked, which mean's the channel will have a lock both from the generator code and the frame_queue code by the time it gets to chan_local.c's local_queue_frame code... local_queue_frame contains some of the same crazy deadlock avoidance that local_hangup requires, and this recursive lock prevents that deadlock avoidance from happening correctly. This patch removes ast_prod() from the channel lock so only one lock is held during the local_queue_frame function. (closes issue #17185) Reported by: schmoozecom Patches: issue_17185_v1.diff uploaded by dvossel (license 671) issue_17185_v2.diff uploaded by dvossel (license 671) Tested by: schmoozecom, GameGamer43 Review: https://reviewboard.asterisk.org/r/631/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259930 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-28Merged revisions 259853 via svnmerge from lmadsen1-92/+61
https://origsvn.digium.com/svn/asterisk/trunk ................ r259853 | lmadsen | 2010-04-28 16:08:34 -0500 (Wed, 28 Apr 2010) | 14 lines Merged revisions 259852 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259852 | lmadsen | 2010-04-28 16:07:48 -0500 (Wed, 28 Apr 2010) | 6 lines Update config.guess. Updating config.guess because after installing Ubuntu Server 9.10 and running all the update scripts, running ./configure would not continue because it was unable to determine what kind of system I had. After updating config.guess things started working again. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259855 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-28Merged revisions 259848 via svnmerge from qwell2-1/+27
https://origsvn.digium.com/svn/asterisk/trunk ................ r259848 | qwell | 2010-04-28 15:32:14 -0500 (Wed, 28 Apr 2010) | 9 lines Merged revisions 259847 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259847 | qwell | 2010-04-28 15:30:21 -0500 (Wed, 28 Apr 2010) | 1 line Add AC_CONFIG_AUX_DIR to configure script, so systems without install can use install-sh from our source dir. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259850 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-28Merged revisions 259837 via svnmerge from qwell1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r259837 | qwell | 2010-04-28 15:26:35 -0500 (Wed, 28 Apr 2010) | 9 lines Merged revisions 259833 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259833 | qwell | 2010-04-28 15:25:36 -0500 (Wed, 28 Apr 2010) | 1 line Missed this when removing $ID ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259843 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-28Merged revisions 259760 via svnmerge from qwell3-48/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r259760 | qwell | 2010-04-28 14:19:54 -0500 (Wed, 28 Apr 2010) | 14 lines Merged revisions 259748 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259748 | qwell | 2010-04-28 14:17:38 -0500 (Wed, 28 Apr 2010) | 7 lines Remove usage of `id` since it isn't useful and was causing breakge. Solaris `id` doesn't support the -u argument. Instead of figuring out how to fix this to work on Solaris, I decided to check why it was necessary and where else it was used. It was only used in one place, and it hasn't been needed for a very long time (I question whether it was ever needed). ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259776 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-28Merged revisions 259672 via svnmerge from jpeeler1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r259672 | jpeeler | 2010-04-28 12:18:43 -0500 (Wed, 28 Apr 2010) | 11 lines Merged revisions 259664 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259664 | jpeeler | 2010-04-28 12:13:29 -0500 (Wed, 28 Apr 2010) | 4 lines Do not play goodbye prompt after timeout of message review. ABE-2124 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259679 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-27Merged revisions 259538 via svnmerge from rmudgett1-4/+19
https://origsvn.digium.com/svn/asterisk/trunk ................ r259538 | rmudgett | 2010-04-27 17:18:09 -0500 (Tue, 27 Apr 2010) | 18 lines Merged revisions 259531 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259531 | rmudgett | 2010-04-27 16:53:07 -0500 (Tue, 27 Apr 2010) | 11 lines DAHDI "WARNING" message is confusing and vague "WARNING[28406]: chan_dahdi.c:6873 ss_thread: CallerID feed failed: Success" Changed the warning to "Failed to decode CallerID on channel 'name'". The message before it is likely more specific about why the CallerID decode failed. SWP-501 AST-283 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259615 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-27Merged revisions 259527 via svnmerge from lmadsen1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r259527 | lmadsen | 2010-04-27 16:49:36 -0500 (Tue, 27 Apr 2010) | 23 lines Merged revisions 259526 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259526 | lmadsen | 2010-04-27 16:48:47 -0500 (Tue, 27 Apr 2010) | 15 lines Update sounds files. * Add additional sounds prompts for say_enumeration * Update the English conference sounds prompts so they are better quality and all sound more consistent * Clean up the core-sounds-XX.txt and extra-sounds-XX.txt files to include all present sound files Both core (en, fr, es) and extra (en, fr) sounds files have been updated. (closes issue #16200) Reported by: murf (closes issue #17137) Reported by: lmadsen ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259529 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-27Merged revisions 259439 via svnmerge from qwell3-54/+59
https://origsvn.digium.com/svn/asterisk/trunk ........ r259439 | qwell | 2010-04-27 16:13:01 -0500 (Tue, 27 Apr 2010) | 5 lines Add gar to the check for AR for those silly OSes (Solaris) that don't have ar. autoconf2.13 couldn't handle AC_PROG_GREP, so I removed it. This is fine, since we don't need to use anything that the configure script doesn't. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259471 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-27Merged revisions 259353 via svnmerge from qwell2-24099/+6499
https://origsvn.digium.com/svn/asterisk/trunk ................ r259353 | qwell | 2010-04-27 14:31:55 -0500 (Tue, 27 Apr 2010) | 12 lines Merged revisions 259352 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259352 | qwell | 2010-04-27 14:29:26 -0500 (Tue, 27 Apr 2010) | 5 lines Support the silly OSes that don't have ar and strip. Since AC_PATH_TOOL is equiv to AC_CHECK_TOOL when path isn't specified, and AC_PATH_TOOLS doesn't exist, we'll just switch to AC_CHECK_TOOLS. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259355 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-27Merged revisions 259307 via svnmerge from rmudgett2-4/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r259307 | rmudgett | 2010-04-27 13:29:33 -0500 (Tue, 27 Apr 2010) | 21 lines Merged revisions 259270 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259270 | rmudgett | 2010-04-27 13:14:54 -0500 (Tue, 27 Apr 2010) | 14 lines hidecalleridname parameter in chan_dahdi.conf Issue #7321 implements a new chan_dahdi configuration option. However, a change mentioned in the issue was never implemented. This is the change that will allow the feature to work. I added a note to chan_dahdi.conf.sample about the feature. (closes issue #17143) Reported by: djensen99 Patches: diff.txt uploaded by djensen99 (license NA) (One line change) Tested by: djensen99 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259309 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-26Merged revisions 259105 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r259105 | mmichelson | 2010-04-26 16:45:13 -0500 (Mon, 26 Apr 2010) | 9 lines Merged revisions 259104 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259104 | mmichelson | 2010-04-26 16:44:43 -0500 (Mon, 26 Apr 2010) | 3 lines Let compilation succeed warning-free when DONT_OPTIMIZE is turned off. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259108 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-26Merged revisions 259023 via svnmerge from mmichelson1-1/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r259023 | mmichelson | 2010-04-26 16:13:35 -0500 (Mon, 26 Apr 2010) | 19 lines Merged revisions 259018 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259018 | mmichelson | 2010-04-26 16:03:08 -0500 (Mon, 26 Apr 2010) | 13 lines Prevent Newchannel manager events for dummy channels. No Newchannel manager event will be fired for channels that are allocated to not match a registered technology type. Thus bogus channels allocated solely for variable substitution or CDR operations do not result in a Newchannel event. (closes issue #16957) Reported by: atis Review: https://reviewboard.asterisk.org/r/601 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@259078 f38db490-d61c-443f-a65b-d21fe96a405b