aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2009-01-28Use autotagged externalsv1.6.1-rc1lmadsen0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.1-rc1@172168 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-28Importing files for 1.6.1-rc1 releaselmadsen3-0/+52269
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.1-rc1@172167 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-28Creating tag for the release of asterisk-1.6.1-rc1lmadsen0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.1-rc1@172166 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-28Merged revisions 172131 via svnmerge from tilghman1-5/+9
https://origsvn.digium.com/svn/asterisk/trunk ........ r172131 | tilghman | 2009-01-28 16:48:01 -0600 (Wed, 28 Jan 2009) | 7 lines Fix how we skip fields (to avoid fields which don't exist) when doing an UPDATE. (closes issue #14205) Reported by: maxgo Patches: 20090128__bug14205__5.diff.txt uploaded by Corydon76 (license 14) Tested by: blitzrage ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@172133 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-28Merged revisions 172063 via svnmerge from murf5-14/+59
https://origsvn.digium.com/svn/asterisk/trunk ................ r172063 | murf | 2009-01-28 13:31:06 -0700 (Wed, 28 Jan 2009) | 52 lines Merged revisions 172030 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r172030 | murf | 2009-01-28 11:51:16 -0700 (Wed, 28 Jan 2009) | 46 lines This patch fixes h-exten running misbehavior in manager-redirected situations. What it does: 1. A new Flag value is defined in include/asterisk/channel.h, AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the bridge hangup exten code not to run the h-exten there (nor publish the bridge cdr there). It will done at the pbx-loop level instead. 2. In the manager Redirect code, I set this flag on the channel if the channel has a non-null pbx pointer. I did the same for the second (chan2) channel, which gets run if name2 is set... and the first succeeds. 3. I restored the ending of the cdr for the pbx loop h-exten running code. Don't know why it was removed in the first place. 4. The first attempt at the fix for this bug was to place code directly in the async_goto routine, which was called from a large number of places, and could affect a large number of cases, so I tested that fix against a fair number of transfer scenarios, both with and without the patch. In the process, I saw that putting the fix in async_goto seemed not to affect any of the blind or attended scenarios, but still, I was was highly concerned that some other scenarios I had not tested might be negatively impacted, so I refined the patch to its current scope, and jmls tested both. In the process, tho, I saw that blind xfers in one situation, when the one-touch blind-xfer feature is used by the peer, we got strange h-exten behavior. So, I inserted code to swap CDRs and to set the HANGUP_DONT field, to get uniform behavior. 5. I added code to the bridge to obey the HANGUP_DONT flag, skipping both publishing the bridge CDR, and running the h-exten; they will be done at the pbx-loop (higher) level instead. 6. I removed all the debug logs from the patch before committing. 7. I moved the AUTOLOOP set/reset in the h-exten code in res_features so it's only done if the h-exten is going to be run. A very minor performance improvement, but technically correct. (closes issue #14241) Reported by: jmls Patches: 14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17) Tested by: murf, jmls ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@172067 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-28Merged revisions 171964 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r171964 | tilghman | 2009-01-28 11:27:40 -0600 (Wed, 28 Jan 2009) | 9 lines Merged revisions 171963 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r171963 | tilghman | 2009-01-28 11:25:18 -0600 (Wed, 28 Jan 2009) | 2 lines Clarify log message (suggested by manxpower on #asterisk-dev) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@171966 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-28Blocked revisions 171797 via svnmergemmichelson0-0/+0
........ r171797 | mmichelson | 2009-01-27 18:17:55 -0600 (Tue, 27 Jan 2009) | 3 lines Fix some signedness problems in func_aes.c ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@171800 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-27Blocked revisions 171757 via svnmergedvossel0-0/+0
........ r171757 | dvossel | 2009-01-27 16:43:36 -0600 (Tue, 27 Jan 2009) | 7 lines Adding AES_ENCRYPT and AES_DECRYPT dialplan functions. (closes issue #14301) Reported by: amorsen review: http://reviewboard.digium.com/r/128/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@171759 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-27Merged revisions 171691 via svnmerge from mmichelson1-64/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r171691 | mmichelson | 2009-01-27 15:58:39 -0600 (Tue, 27 Jan 2009) | 47 lines Merged revisions 171689 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r171689 | mmichelson | 2009-01-27 15:55:08 -0600 (Tue, 27 Jan 2009) | 39 lines Fix devicestate problems for "always-on" agent channels A revision to chan_agent attempted to "inherit" the device state of the underlying channel in order to report the device state of an agent channel more accurately. The problem with the logic here is that it makes no sense to use this for always-on agents. If the agent is logged in, then to the underlying channel, the agent will always appear to be "in use," no matter if the agent is on a call or not. The reason is that to the underlying channel, the channel is currently in use on a call to the AgentLogin application. The most common cause that I found for this issue to occur was for a SIP channel to be the underlying channel type for an Agent channel. If the SIP phone re-registers, then the registration will cause the device state core to query the device state of the SIP channel. Since the SIP channel is in use, the Agent channel would also inherit this status. Once the agent channel was set to "in use" there was no way that the device state could change on that channel unless the agent logged out. The solution for this problem is a bit different in 1.4 than it is in the other branches. In 1.4, there will be a one-line fix to make sure that only callback agents will inherit device state from their underlying channel type. For the other branches of Asterisk, since callback support has been removed, there is also no need for device state inheritance in chan_agent, so I will simply be removing it from the code. In addition, the 1.4 source is getting a new comment to help the next person who edits chan_agent.c. I'm adding a comment that a agent_pvt's loginchan field may be used to determine if the agent is a callback agent or not. (closes issue #14173) Reported by: nathan Patches: 14173.patch uploaded by putnopvut (license 60) Tested by: nathan, aramirez ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@171693 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-27Merged revisions 171622 via svnmerge from mmichelson1-0/+10
https://origsvn.digium.com/svn/asterisk/trunk ................ r171622 | mmichelson | 2009-01-27 14:11:30 -0600 (Tue, 27 Jan 2009) | 26 lines Merged revisions 171621 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r171621 | mmichelson | 2009-01-27 14:06:01 -0600 (Tue, 27 Jan 2009) | 18 lines Prevent a crash from occurring when a jitter buffer interpolated frame is removed from a slinfactory slinfactory used the "samples" field of an ast_frame in order to determine the amount of data contained within the frame. In certain cases, such as jitter buffer interpolated frames, the frame would have a non-zero value for "samples" but have NULL "data" This caused a problem when a memcpy call in ast_slinfactory_read would attempt to access invalid memory. The solution in use here is to never feed frames into the slinfactory if they have NULL "data" (closes issue #13116) Reported by: aragon Patches: 13116.diff uploaded by putnopvut (license 60) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@171624 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-27Merged revisions 171618 via svnmerge from mmichelson1-16/+44
https://origsvn.digium.com/svn/asterisk/trunk ........ r171618 | mmichelson | 2009-01-27 13:30:54 -0600 (Tue, 27 Jan 2009) | 24 lines Fix queue crashes that would occur after the calling channel was masqueraded. The data passed to the end_bridge_callback was assumed to be data which was still stack'd. The problem was that with some call features, attended transfers in particular, a new bridge thread is started once the feature completes, meaning that when the end_bridge_callback is called, the end_bridge_callback_data was invalid. To fix this problem, there are two measures taken 1. Instead of pointing to stacked data, we now used heap-allocated data for passing to the end_bridge_callback in app_queue 2. Since bridges can end multiple times on a single logical call, we wait until the final bridge is broken to actually set any queue variables. This is accomplished through reference-counting and the use of an end_bridge_callback_data_fixup function in app_queue.c (closes issue #14260) Reported by: ccesario Patches: 14260.patch uploaded by putnopvut (license 60) Tested by: ccesario ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@171620 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-27Merged revisions 171528 via svnmerge from oej1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r171528 | oej | 2009-01-27 16:00:19 +0100 (Tis, 27 Jan 2009) | 23 lines Solving the same issue, but a bit different in trunk... Merged revisions 171527 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r171527 | oej | 2009-01-27 15:33:20 +0100 (Tis, 27 Jan 2009) | 13 lines Use the same branch tag in CANCEL as in INVITE Originally putnopvut implemented some changes in revision 142079 that according to the bug report seemed to have worked then, but somehow fails now. I guess code, as humans, get old and forget stuff. Anyway, this bug caused CANCEL not to work with picky systems. Thanks Fredrik for pointing out where the bug in the SIP messaging was. (closes issue #14346) Reported by: oej Patches: bug14346.diff uploaded by oej (license 306) Tested by: oej ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@171540 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-26Merged revisions 171326 via svnmerge from oej1-5/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r171326 | oej | 2009-01-26 14:44:40 +0100 (MÃ¥n, 26 Jan 2009) | 17 lines Merged revisions 171264 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r171264 | oej | 2009-01-26 13:51:53 +0100 (MÃ¥n, 26 Jan 2009) | 9 lines Don't retransmit 401 on REGISTER requests when alwaysauthreject=yes (closes issue #14284) Reported by: klaus3000 Patches: patch_chan_sip_unreliable_1.4.23_14284.txt uploaded by klaus3000 (license 65) Tested by: klaus3000 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@171361 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-26Merged revisions 171188 via svnmerge from tilghman1-10/+11
https://origsvn.digium.com/svn/asterisk/trunk ................ r171188 | tilghman | 2009-01-25 17:58:00 -0600 (Sun, 25 Jan 2009) | 13 lines Merged revisions 171187 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r171187 | tilghman | 2009-01-25 17:44:01 -0600 (Sun, 25 Jan 2009) | 6 lines Correctly track the hookstate (closes issue #13686) Reported by: itiliti Patches: 20081013__bug13686.diff.txt uploaded by Corydon76 (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@171190 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-25Blocked revisions 171081 via svnmergemvanbaak0-0/+0
........ r171081 | mvanbaak | 2009-01-25 17:50:53 +0100 (Sun, 25 Jan 2009) | 2 lines dont segfault when a MWI event occurs on a line without a registered device ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@171083 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-25Blocked revisions 171043 via svnmergemvanbaak0-0/+0
........ r171043 | mvanbaak | 2009-01-25 15:35:17 +0100 (Sun, 25 Jan 2009) | 7 lines Make the sample skinny.conf work (closes issue #14325) Reported by: DEA Patches: skinny.conf.sample-trunk.txt uploaded by DEA (license 3) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@171045 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-25Merged revisions 170980 via svnmerge from seanbright1-4/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r170980 | seanbright | 2009-01-25 08:35:48 -0500 (Sun, 25 Jan 2009) | 16 lines Merged revisions 170979 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170979 | seanbright | 2009-01-25 08:33:20 -0500 (Sun, 25 Jan 2009) | 9 lines Resolve a logic error that was causing Page() to crash when more than one channel was specified. (closes issue #14308) Reported by: bluefox Patches: 20090124__bug14308.diff.txt uploaded by seanbright (license 71) Tested by: kc0bvu ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170982 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-25Merged revisions 170943 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r170943 | russell | 2009-01-24 20:49:30 -0600 (Sat, 24 Jan 2009) | 6 lines Change ARRAY_LEN() to be more C++ safe. When the second part of this macro is written as 0[a] instead of a[0], it will force a failure if the macro is used on a C++ object that overloads the [] operator. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170945 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-24Blocked revisions 170902 via svnmergerussell0-0/+0
........ r170902 | russell | 2009-01-24 13:33:15 -0600 (Sat, 24 Jan 2009) | 2 lines Add a todo to finish the XML docs in this module ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170904 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 170794 via svnmerge from rmudgett1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r170794 | rmudgett | 2009-01-23 17:10:34 -0600 (Fri, 23 Jan 2009) | 1 line Fix asterisk.pdf generation if branch name has an underscore in it. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170831 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-23Merged revisions 170790 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r170790 | russell | 2009-01-23 16:58:37 -0600 (Fri, 23 Jan 2009) | 2 lines Don't blow up if a branch name has an underscore in it ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170792 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-23Merged revisions 170677 via svnmerge from mmichelson1-114/+163
https://origsvn.digium.com/svn/asterisk/trunk ................ r170677 | mmichelson | 2009-01-23 14:23:00 -0600 (Fri, 23 Jan 2009) | 22 lines Merged revisions 170671 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170671 | mmichelson | 2009-01-23 14:21:51 -0600 (Fri, 23 Jan 2009) | 14 lines Update contrib/i18n.testsuite.conf to not use deprecated syntax * Convert Wait,1 to Wait(1) * Convert SetLanguage to Set(CHANNEL(language)) * Use 'n' for all priorities beyond the first Also added test for Chinese numbers, too. (closes issue #14320) Reported by: dant Patches: i18n.testsuite.conf.issue14320.v2.diff uploaded by dant (license 670) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170693 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-23Merged revisions 170652 via svnmerge from file1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r170652 | file | 2009-01-23 16:18:05 -0400 (Fri, 23 Jan 2009) | 11 lines Merged revisions 170648 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170648 | file | 2009-01-23 16:16:39 -0400 (Fri, 23 Jan 2009) | 4 lines When a channel is answered make sure any indications currently playing stop. Usually the phone would do this but if the channel was already answered then they are being generated by Asterisk and we darn well need to stop them. (closes issue #14249) Reported by: RadicAlish ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170664 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-23Merged revisions 170608 via svnmerge from tilghman1-16/+18
https://origsvn.digium.com/svn/asterisk/trunk ................ r170608 | tilghman | 2009-01-23 13:25:10 -0600 (Fri, 23 Jan 2009) | 9 lines Merged revisions 170588 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170588 | tilghman | 2009-01-23 13:20:44 -0600 (Fri, 23 Jan 2009) | 2 lines Additions to AST-2009-001 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170637 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-23Merged revisions 170569 via svnmerge from file1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r170569 | file | 2009-01-23 15:09:18 -0400 (Fri, 23 Jan 2009) | 11 lines Merged revisions 170568 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170568 | file | 2009-01-23 15:06:54 -0400 (Fri, 23 Jan 2009) | 4 lines When a call is forwarded stop any active indications. The new channel will provide an indication, if need be, itself. (closes issue #14310) Reported by: RadicAlish ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170571 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-23Merged revisions 170505 via svnmerge from file1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r170505 | file | 2009-01-23 14:09:45 -0400 (Fri, 23 Jan 2009) | 11 lines Merged revisions 170504 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170504 | file | 2009-01-23 14:04:08 -0400 (Fri, 23 Jan 2009) | 4 lines Use the on hold flag to see if the call is on hold or not. It is possible that our address for them will still be valid even though they are on hold. (closes issue #14295) Reported by: klaus3000 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170507 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-23Merged revisions 170501 via svnmerge from mvanbaak1-5/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r170501 | mvanbaak | 2009-01-23 18:46:02 +0100 (Fri, 23 Jan 2009) | 1 line let's use SENTINEL where needed ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170502 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-23Blocked revisions 170498 via svnmergefile0-0/+0
........ r170498 | file | 2009-01-23 13:32:26 -0400 (Fri, 23 Jan 2009) | 4 lines Reset the ast_str used for escape substitution. We need to do this since it is a thread local variable that may contain the value of a previous substitution. (closes issue #14312) Reported by: pj ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170500 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-23Blocked revisions 170460 via svnmergemvanbaak0-0/+0
........ r170460 | mvanbaak | 2009-01-23 17:57:07 +0100 (Fri, 23 Jan 2009) | 8 lines Dont clear the display of skinny phones when not needed. (closes issue #13182) Reported by: pj Patches: 2009011901_dontcleardisplay.diff.txt uploaded by mvanbaak (license 7) Tested by: mvanbaak, pj ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170462 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-23MWI messages included in CID spill was not being properly handled and ↵dbailey1-2/+2
prevented the call from being processed (issue #14313) Reported by: seandarcy Tested by: dbailey git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170458 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-23Merged revisions 170393 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r170393 | mmichelson | 2009-01-23 09:44:27 -0600 (Fri, 23 Jan 2009) | 36 lines Merged revisions 170392 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170392 | mmichelson | 2009-01-23 09:40:39 -0600 (Fri, 23 Jan 2009) | 28 lines Fix broken call pickup There was a subtle change in ast_do_masquerade which resulted in failed attempts to pickup calls. The problem was that the value of the AST_FLAG_OUTGOING flag was copied from the clone to the original channel. In the case of call pickup, this meant that the AST_FLAG_OUTGOING flag ended up being cleared on the channel that was attempting to execute the pickup. Because this flag was not set, when ast_read came across an answer frame, it ignored it. The result of this was that the calling channel was never properly answered. This fix changes the behavior in ast_do_masquerade to set the flags on the original channel to the union of the flags on the clone channel. This way, if the AST_FLAG_OUTGOING flag is set on either of the two channels involved in the masquerade, the resulting channel will have the flag set as well. (closes issue #14206) Reported by: francesco_r Patches: 14206.patch uploaded by putnopvut (license 60) Tested by: francesco_r, aragon, putnopvut ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170395 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-22Blocked revisions 170307 via svnmergetilghman0-0/+0
........ r170307 | tilghman | 2009-01-22 15:25:46 -0600 (Thu, 22 Jan 2009) | 6 lines Create logfile safely. (closes issue #14160) Reported by: tzafrir Patches: 20090104__bug14160.diff.txt uploaded by Corydon76 (license 14) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170308 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-22Merged revisions 170240 via svnmerge from file1-12/+12
https://origsvn.digium.com/svn/asterisk/trunk ................ r170240 | file | 2009-01-22 16:04:39 -0400 (Thu, 22 Jan 2009) | 14 lines Merged revisions 170239 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170239 | file | 2009-01-22 16:02:35 -0400 (Thu, 22 Jan 2009) | 7 lines Don't crash if RTCP is not enabled on an RTP structure but statistics are output. (closes issue #14234) Reported by: jcovert Patches: rtp.c.patch-1.6.0.3 uploaded by jcovert (license 551) rtp.c.patch-svn-165599 uploaded by jcovert (license 551) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170242 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-22Merged revisions 170165 via svnmerge from tilghman1-0/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r170165 | tilghman | 2009-01-22 11:19:28 -0600 (Thu, 22 Jan 2009) | 13 lines Merged revisions 170158 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170158 | tilghman | 2009-01-22 11:18:07 -0600 (Thu, 22 Jan 2009) | 6 lines Allow global variables after substitution to be as long as other variables. (closes issue #14263) Reported by: markd Patches: 20090120__bug14263.diff.txt uploaded by Corydon76 (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170178 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-22Merged revisions 170148 via svnmerge from file1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r170148 | file | 2009-01-22 12:52:21 -0400 (Thu, 22 Jan 2009) | 11 lines Merged revisions 170147 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170147 | file | 2009-01-22 12:50:54 -0400 (Thu, 22 Jan 2009) | 4 lines If we are unable to request a DAHDI pseudo channel and we are using the user introduction without review option make sure it gets unset so other code does not blindly assume a DAHDI pseudo channel exists. (closes issue #14282) Reported by: cheesegrits ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170150 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-22Merged revisions 170051 via svnmerge from file1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r170051 | file | 2009-01-22 11:14:50 -0400 (Thu, 22 Jan 2009) | 13 lines Merged revisions 170050 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r170050 | file | 2009-01-22 11:13:56 -0400 (Thu, 22 Jan 2009) | 6 lines Do a string comparison instead of pointer comparison since some people specify the context they are actually in as an argument to get around some funkiness. (closes issue #14011) Reported by: dveiga Patches: pbx.c.patch uploaded by dveiga (license 665) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170053 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-22Merged revisions 170047 via svnmerge from file1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r170047 | file | 2009-01-22 11:01:54 -0400 (Thu, 22 Jan 2009) | 4 lines Clear the autoloop flag when parsing and setting the context/extension/priority to go back to. When the channel executes a PBX again we want it to start out at the point we explicitly say and at that point it will not yet be doing autoloop. (closes issue #14304) Reported by: jcovert ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@170049 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-22Merged revisions 169944 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r169944 | tilghman | 2009-01-21 18:44:52 -0600 (Wed, 21 Jan 2009) | 16 lines Merged revisions 169943 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r169943 | tilghman | 2009-01-21 18:43:31 -0600 (Wed, 21 Jan 2009) | 9 lines AST_RWLOCK_INIT_VALUE is always defined. What we really wanted to ask is whether autoconf detected a static initializer value. This fixes rwlocks on all such platforms (mainly, Mac OS X). (closes issue #13767) Reported by: jcovert Patches: 20090121__bug13767.diff.txt uploaded by Corydon76 (license 14) Tested by: jcovert, Corydon76 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169946 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-21Merged revisions 169869 via svnmerge from file1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r169869 | file | 2009-01-21 19:25:27 -0400 (Wed, 21 Jan 2009) | 11 lines Merged revisions 169867 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r169867 | file | 2009-01-21 19:20:47 -0400 (Wed, 21 Jan 2009) | 4 lines Read lock the contexts to maintain the locking order when we are notified that the state of a device has changed. (closes issue #13839) Reported by: mcallist ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169871 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-21Merged revisions 169793 via svnmerge from mvanbaak1-3/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r169793 | mvanbaak | 2009-01-21 23:04:16 +0100 (Wed, 21 Jan 2009) | 2 lines remove duplicated sentence. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169830 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-21Blocked revisions 169798 via svnmergemmichelson0-0/+0
................ r169798 | mmichelson | 2009-01-21 16:15:16 -0600 (Wed, 21 Jan 2009) | 10 lines Blocked revisions 169797 via svnmerge ........ r169797 | mmichelson | 2009-01-21 16:14:52 -0600 (Wed, 21 Jan 2009) | 3 lines Adding revision 169794 to 1.4 since 1.4 is also affected by the issue ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169799 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-21Merged revisions 169794 via svnmerge from mmichelson1-8/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r169794 | mmichelson | 2009-01-21 16:10:02 -0600 (Wed, 21 Jan 2009) | 17 lines Fix a crash when saying certain numbers in Chinese This commit fixes a crash that was occurring when attempting to say a number between 10000 and 100000 due to dividing by 0. This also removes some places where a "zero" is spoken when it should not be. (closes issue #14291) Reported by: dant Patches: say.c-14291.diff uploaded by dant (license 670) Tested by: dant ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169796 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-21Merged revisions 169791 via svnmerge from mmichelson1-6/+21
https://origsvn.digium.com/svn/asterisk/trunk ........ r169791 | mmichelson | 2009-01-21 15:53:55 -0600 (Wed, 21 Jan 2009) | 18 lines Further fix some oddities in sip show users and sip show peers logic ccesario on IRC pointed out that his sip peers were not displayed properly when he would issue the command "sip show peers." The problem was that the onlymatchonip field was used to determine if the endpoint was a "peer" or "user." The tricky part is that a "friend" is supposed to be treated as both a "user" and a "peer" but the logic would not allow "friends" to show up as "peers" since onlymatchonip was set to FALSE for friends. I have modified the sip_peer structure to more explicitly keep track of what type endpoint it is so that the various manager and CLI commands will display the expected information Reported by ccesario via IRC Tested by ccesario ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169792 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-21Merged revisions 169723 via svnmerge from tilghman1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r169723 | tilghman | 2009-01-21 15:03:40 -0600 (Wed, 21 Jan 2009) | 15 lines Merged revisions 169722 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r169722 | tilghman | 2009-01-21 15:02:32 -0600 (Wed, 21 Jan 2009) | 8 lines Extra NULLs in the output cause some terminal types to abort in the middle of a color code, causing terminal weirdness. (closes issue #14130) Reported by: coolmig Patches: 20090121__bug14130.diff.txt uploaded by Corydon76 (license 14) Tested by: Corydon76, coolmig ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169725 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-21Merged revisions 169673 via svnmerge from murf1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r169673 | murf | 2009-01-21 10:21:40 -0700 (Wed, 21 Jan 2009) | 14 lines This patch corrects a segfault reported in 14289, due to a null ptr being refd. Yes, seanbright is right in the bug comments, that is the fix. Sorry for this oversight; I guess my personal usage didn't have this happen! murf (closes issue #14289) Reported by: jamesgolovich ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169674 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-21Merged revisions 169625 via svnmerge from russell0-0/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r169625 | russell | 2009-01-21 04:49:00 -0600 (Wed, 21 Jan 2009) | 2 lines Remove properties that erroneously got merged into trunk ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169626 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-21Merged revisions 169620 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r169620 | russell | 2009-01-21 04:26:07 -0600 (Wed, 21 Jan 2009) | 10 lines Fix a regression in TCP support. This patch fixes a problem that caused chan_sip to think that every open TCP session was to a remote address of 0.0.0.0:0. (closes issue #14287) Reported by: jamesgolovich Patches: bug-14287.diff.txt uploaded by jamesgolovich (license 176) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169622 f38db490-d61c-443f-a65b-d21fe96a405b