aboutsummaryrefslogtreecommitdiffstats
path: root/main
AgeCommit message (Collapse)AuthorFilesLines
2009-07-08Merged revisions 205120 via svnmerge from russell3-1/+106
https://origsvn.digium.com/svn/asterisk/trunk ........ r205120 | russell | 2009-07-08 10:17:19 -0500 (Wed, 08 Jul 2009) | 16 lines Move OpenSSL initialization to a single place, make library usage thread-safe. While doing some reading about OpenSSL, I noticed a couple of things that needed to be improved with our usage of OpenSSL. 1) We had initialization of the library done in multiple modules. This has now been moved to a core function that gets executed during Asterisk startup. We already link OpenSSL into the core for TCP/TLS functionality, so this was the most logical place to do it. 2) OpenSSL is not thread-safe by default. However, making it thread safe is very easy. We just have to provide a couple of callbacks. One callback returns a thread ID. The other handles locking. For more information, start with the "Is OpenSSL thread-safe?" question on the FAQ page of openssl.org. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@205139 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-06Restore Hungarian (mistakenly removed during merge)tilghman1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@204980 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-06Merged revisions 204948 via svnmerge from kpfleming1-3/+10
https://origsvn.digium.com/svn/asterisk/trunk ........ r204948 | kpfleming | 2009-07-06 08:38:29 -0500 (Mon, 06 Jul 2009) | 7 lines Improve handling of AST_CONTROL_T38 and AST_CONTROL_T38_PARAMETERS for non-T.38-capable channels. This change allows applications that request T.38 negotiation on a channel that does not support it to get the proper indication that it is not supported, rather than thinking that negotiation was started when it was not. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@204949 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-02Merged revisions 204710 via svnmerge from dvossel2-61/+153
https://origsvn.digium.com/svn/asterisk/trunk ................ r204710 | dvossel | 2009-07-02 11:03:44 -0500 (Thu, 02 Jul 2009) | 21 lines Merged revisions 204681 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r204681 | dvossel | 2009-07-02 10:05:57 -0500 (Thu, 02 Jul 2009) | 14 lines Improved mapping of extension states from combined device states. This fixes a few issues with incorrect extension states and adds a cli command, core show device2extenstate, to display all possible state mappings. (closes issue #15413) Reported by: legart Patches: exten_helper.diff uploaded by dvossel (license 671) Tested by: dvossel, legart, amilcar Review: https://reviewboard.asterisk.org/r/301/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@204754 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-30Merged revisions 204563 via svnmerge from tilghman1-213/+205
https://origsvn.digium.com/svn/asterisk/trunk ................ r204563 | tilghman | 2009-06-30 15:41:04 -0500 (Tue, 30 Jun 2009) | 13 lines Merged revisions 204556 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r204556 | tilghman | 2009-06-30 15:23:51 -0500 (Tue, 30 Jun 2009) | 6 lines More incorrect language codes, plus ensuring that regionalizations use the specified language, and not English for grammar. (closes issue #15022) Reported by: greenfieldtech Patches: 20090519__issue15022.diff.txt uploaded by tilghman (license 14) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@204581 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-30Merged revisions 204475 via svnmerge from qwell1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r204475 | qwell | 2009-06-30 13:48:35 -0500 (Tue, 30 Jun 2009) | 9 lines Merged revisions 204474 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r204474 | qwell | 2009-06-30 13:47:06 -0500 (Tue, 30 Jun 2009) | 1 line Fix ast_say_counted_noun to correctly handle Polish. Fix a comment typo in passing. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@204476 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-30Recorded merge of revisions 204470 via svnmerge from tilghman1-25/+24
https://origsvn.digium.com/svn/asterisk/trunk ................ r204470 | tilghman | 2009-06-30 13:36:24 -0500 (Tue, 30 Jun 2009) | 18 lines Recorded merge of revisions 204469 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r204469 | tilghman | 2009-06-30 13:23:35 -0500 (Tue, 30 Jun 2009) | 11 lines "tw" is the language specification for Twi (from Ghana) not Taiwanese. (closes issue #15346) Reported by: volivier Patches: 20090617__issue15346__1.4.diff.txt uploaded by tilghman (license 14) 20090617__issue15346__trunk.diff.txt uploaded by tilghman (license 14) 20090617__issue15346__1.6.0.diff.txt uploaded by tilghman (license 14) 20090617__issue15346__1.6.1.diff.txt uploaded by tilghman (license 14) 20090617__issue15346__1.6.2.diff.txt uploaded by tilghman (license 14) Tested by: volivier ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@204471 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-26Merged revisions 203802 via svnmerge from russell1-0/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r203802 | russell | 2009-06-26 16:21:48 -0500 (Fri, 26 Jun 2009) | 22 lines Merged revisions 203785 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r203785 | russell | 2009-06-26 16:16:39 -0500 (Fri, 26 Jun 2009) | 15 lines Don't fast forward past the end of a message. This is nice change for users of the voicemail application. If someone gets a little carried away with fast forwarding through a message, they can easily get to the end and accidentally exit the voicemail application by hitting the fast forward key during the following prompt. This adds some safety by not allowing a fast forward past the end of a message. (closes issue #14554) Reported by: lacoursj Patches: 21761.patch uploaded by lacoursj (license 707) Tested by: lacoursj ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@203818 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-26Merged revisions 203699 via svnmerge from file3-2/+26
https://origsvn.digium.com/svn/asterisk/trunk ........ r203699 | file | 2009-06-26 16:27:24 -0300 (Fri, 26 Jun 2009) | 2 lines Improve T.38 negotiation by exchanging session parameters between application and channel. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@203701 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-25Merged revisions 203444 via svnmerge from dvossel2-7/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r203444 | dvossel | 2009-06-25 16:45:32 -0500 (Thu, 25 Jun 2009) | 4 lines fixes a few redundant conditions (issue #15269) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@203447 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-25Merged revisions 203381 via svnmerge from twilson1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r203381 | twilson | 2009-06-25 16:15:11 -0500 (Thu, 25 Jun 2009) | 11 lines Merged revisions 203380 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r203380 | twilson | 2009-06-25 16:13:10 -0500 (Thu, 25 Jun 2009) | 4 lines I didn't see that Mark already fixed the underlying issue! Yay for removing useless code. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@203387 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-25Merged revisions 203376 via svnmerge from russell1-1/+10
https://origsvn.digium.com/svn/asterisk/trunk ................ r203376 | russell | 2009-06-25 16:04:55 -0500 (Thu, 25 Jun 2009) | 16 lines Merged revisions 203375 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r203375 | russell | 2009-06-25 16:02:18 -0500 (Thu, 25 Jun 2009) | 9 lines Fix a case where CDR answer time could be before the start time involving parking. (closes issue #13794) Reported by: davidw Patches: 13794.patch uploaded by murf (license 17) 13794.patch.160 uploaded by murf (license 17) Tested by: murf, dbrooks ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@203377 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-25Merged revisions 203231 via svnmerge from mmichelson1-1/+7
https://origsvn.digium.com/svn/asterisk/trunk ................ r203231 | mmichelson | 2009-06-25 13:53:12 -0500 (Thu, 25 Jun 2009) | 8 lines Blocked revisions 203230 via svnmerge ........ r203230 | mmichelson | 2009-06-25 13:52:22 -0500 (Thu, 25 Jun 2009) | 3 lines Prevent false positives when freeing a NULL pointer with MALLOC_DEBUG enabled. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@203232 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-23Merged revisions 202753 via svnmerge from rbrindley1-5/+24
https://origsvn.digium.com/svn/asterisk/trunk ........ r202753 | rbrindley | 2009-06-23 16:25:17 -0500 (Tue, 23 Jun 2009) | 9 lines If we delete the info, lets also delete the lines (closes issue #14509) Reported by: timeshell Patches: 20090504__bug14509.diff.txt uploaded by tilghman (license 14) Tested by: awk, timeshell ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@202754 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-22Merged revisions 202497 via svnmerge from russell1-14/+24
https://origsvn.digium.com/svn/asterisk/trunk ................ r202497 | russell | 2009-06-22 15:11:04 -0500 (Mon, 22 Jun 2009) | 11 lines Merged revisions 202496 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r202496 | russell | 2009-06-22 15:08:53 -0500 (Mon, 22 Jun 2009) | 4 lines Report CallerID change during a masquerade. Reported by: markster ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@202498 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-19Merged revisions 201829 via svnmerge from tilghman1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r201829 | tilghman | 2009-06-18 19:43:41 -0500 (Thu, 18 Jun 2009) | 13 lines Merged revisions 201828 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r201828 | tilghman | 2009-06-18 19:40:41 -0500 (Thu, 18 Jun 2009) | 6 lines If the "h" extension fails, give it another chance in main/pbx.c. If the "h" extension fails, give it another chance in main/pbx.c, when it returns from the bridge code. Fixes an issue where the "h" extension may occasionally not fire, when a Dial is executed from a Macro. Debugged in #asterisk with user tompaw. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@201830 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-18Merged revisions 201678 via svnmerge from dvossel3-5/+4
https://origsvn.digium.com/svn/asterisk/trunk ........ r201678 | dvossel | 2009-06-18 11:37:42 -0500 (Thu, 18 Jun 2009) | 11 lines fixes some memory leaks and redundant conditions (closes issue #15269) Reported by: contactmayankjain Patches: patch.txt uploaded by contactmayankjain (license 740) memory_leak_stuff.trunk.diff uploaded by dvossel (license 671) Tested by: contactmayankjain, dvossel ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@201682 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-17Merged revisions 201458 via svnmerge from mmichelson1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r201458 | mmichelson | 2009-06-17 15:04:12 -0500 (Wed, 17 Jun 2009) | 15 lines Merged revisions 201450 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r201450 | mmichelson | 2009-06-17 14:59:31 -0500 (Wed, 17 Jun 2009) | 9 lines Change the datastore traversal in ast_do_masquerade to use a safe list traversal. It is possible for datastore fixup functions to remove the datastore from the list and free it. In particular, the queue_transfer_fixup in app_queue does this. While I don't yet know of this causing any crashes, it certainly could. Found while discussing a separate issue with Brian Degenhardt. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@201459 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-16Merged revisions 201056,201090 via svnmerge from kpfleming5-167/+251
https://origsvn.digium.com/svn/asterisk/trunk ................ r201056 | kpfleming | 2009-06-16 13:54:30 -0500 (Tue, 16 Jun 2009) | 18 lines Merged revisions 200991 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r200991 | kpfleming | 2009-06-16 12:05:38 -0500 (Tue, 16 Jun 2009) | 11 lines Improve support for media paths that can generate multiple frames at once. There are various media paths in Asterisk (codec translators and UDPTL, primarily) that can generate more than one frame to be generated when the application calling them expects only a single frame. This patch addresses a number of those cases, at least the primary ones to solve the known problems. In addition it removes the broken TRACE_FRAMES support, fixes a number of bugs in various frame-related API functions, and cleans up various code paths affected by these changes. https://reviewboard.asterisk.org/r/175/ ........ ................ r201090 | kpfleming | 2009-06-16 14:27:12 -0500 (Tue, 16 Jun 2009) | 5 lines Another minor fix to compiler attribute checking. Defaulting to 'static' for the function scope was bad... so remove it. ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@201093 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-12Merged revisions 200361 via svnmerge from mmichelson1-0/+10
https://origsvn.digium.com/svn/asterisk/trunk ................ r200361 | mmichelson | 2009-06-12 14:07:51 -0500 (Fri, 12 Jun 2009) | 16 lines Merged revisions 200360 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r200360 | mmichelson | 2009-06-12 14:06:41 -0500 (Fri, 12 Jun 2009) | 10 lines Suppress a warning message and give a better return code when generating inband ringing after a call is answered. (closes issue #15158) Reported by: madkins Patches: 15158.patch uploaded by mmichelson (license 60) Tested by: madkins ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@200362 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-10Fixes the argument order in definition of new_find_extension().dbrooks1-1/+1
In the definition of new_find_extension(), the arguments 'callerid' and 'label' were swapped. The prototype declaration and all calls to the function are ordered 'callerid' then 'label', but the function itself was ordered 'label' then 'callerid'. (closes issue #15303) Reported by: JimDickenson git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@199994 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-05Merged revisions 199298 via svnmerge from dvossel1-19/+12
https://origsvn.digium.com/svn/asterisk/trunk ................ r199298 | dvossel | 2009-06-05 16:21:22 -0500 (Fri, 05 Jun 2009) | 21 lines Merged revisions 199297 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r199297 | dvossel | 2009-06-05 16:19:56 -0500 (Fri, 05 Jun 2009) | 14 lines Fixes issue with hints giving unexpected results. Hints with two or more devices that include ONHOLD gave unexpected results. (closes issue #15057) Reported by: p_lindheimer Patches: onhold_trunk.diff uploaded by dvossel (license 671) pbx.c.1.4.patch uploaded by p (license 558) devicestate.c.trunk.patch uploaded by p (license 671) Tested by: p_lindheimer, dvossel Review: https://reviewboard.asterisk.org/r/254/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@199301 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-04Merged revisions 199051 via svnmerge from seanbright2-0/+84
https://origsvn.digium.com/svn/asterisk/trunk ................ r199051 | seanbright | 2009-06-04 10:31:24 -0400 (Thu, 04 Jun 2009) | 47 lines Merged revisions 199022 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r199022 | seanbright | 2009-06-04 10:14:57 -0400 (Thu, 04 Jun 2009) | 40 lines Safely handle AMI connections/reload requests that occur during startup. During asterisk startup, a lock on the list of modules is obtained by the primary thread while each module is initialized. Issue 13778 pointed out a problem with this approach, however. Because the AMI is loaded before other modules, it is possible for a module reload to be issued by a connected client (via Action: Command), causing a deadlock. The resolution for 13778 was to move initialization of the manager to happen after the other modules had already been lodaded. While this fixed this particular issue, it caused a problem for users (like FreePBX) who call AMI scripts via an #exec in a configuration file (See issue 15189). The solution I have come up with is to defer any reload requests that come in until after the server is fully booted. When a call comes in to ast_module_reload (from wherever) before we are fully booted, the request is added to a queue of pending requests. Once we are done booting up, we then execute these deferred requests in turn. Note that I have tried to make this a bit more intelligent in that it will not queue up more than 1 request for the same module to be reloaded, and if a general reload request comes in ('module reload') the queue is flushed and we only issue a single deferred reload for the entire system. As for how this will impact existing installations - Before 13778, a reload issued before module initialization was completed would result in a deadlock. After 13778, you simply couldn't connect to the manager during startup (which causes problems with #exec-that-calls-AMI configuration files). I believe this is a good general purpose solution that won't negatively impact existing installations. (closes issue #15189) (closes issue #13778) Reported by: p_lindheimer Patches: 06032009_15189_deferred_reloads.diff uploaded by seanbright (license 71) Tested by: p_lindheimer, seanbright Review: https://reviewboard.asterisk.org/r/272/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@199052 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-03Merged revisions 198856 via svnmerge from dvossel2-6/+100
https://origsvn.digium.com/svn/asterisk/trunk ........ r198856 | dvossel | 2009-06-02 16:17:49 -0500 (Tue, 02 Jun 2009) | 10 lines Generic call forward api, ast_call_forward() The function ast_call_forward() forwards a call to an extension specified in an ast_channel's call_forward string. After an ast_channel is called, if the channel's call_forward string is set this function can be used to forward the call to a new channel and terminate the original one. I have included this api call in both channel.c's ast_request_and_dial() and feature.c's feature_request_and_dial(). App_dial and app_queue already contain call forward logic specific for their application and options. (closes issue #13630) Reported by: festr Review: https://reviewboard.asterisk.org/r/271/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@198889 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-29Merged revisions 198072 via svnmerge from mnicholson2-2/+11
https://origsvn.digium.com/svn/asterisk/trunk ................ r198072 | mnicholson | 2009-05-29 14:04:24 -0500 (Fri, 29 May 2009) | 21 lines Merged revisions 198068 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r198068 | mnicholson | 2009-05-29 13:53:01 -0500 (Fri, 29 May 2009) | 15 lines Use AST_CDR_NOANSWER instead of AST_CDR_NULL as the default CDR disposition. This change also involves the addition of an AST_CDR_FLAG_ORIGINATED flag that is used on originated channels to distinguish: them from dialed channels. (closes issue #12946) Reported by: meral Patches: null-cdr2.diff uploaded by mnicholson (license 96) Tested by: mnicholson, dbrooks (closes issue #15122) Reported by: sum Tested by: sum ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@198073 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-28Merged revisions 197606 via svnmerge from mmichelson1-4/+20
https://origsvn.digium.com/svn/asterisk/trunk ................ r197606 | mmichelson | 2009-05-28 10:32:19 -0500 (Thu, 28 May 2009) | 22 lines Recorded merge of revisions 197588 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r197588 | mmichelson | 2009-05-28 10:27:49 -0500 (Thu, 28 May 2009) | 16 lines Allow for media to arrive from an alternate source when responding to a reinvite with 491. When we receive a SIP reinvite, it is possible that we may not be able to process the reinvite immediately since we have also sent a reinvite out ourselves. The problem is that whoever sent us the reinvite may have also sent a reinvite out to another party, and that reinvite may have succeeded. As a result, even though we are not going to accept the reinvite we just received, it is important for us to not have problems if we suddenly start receiving RTP from a new source. The fix for this is to grab the media source information from the SDP of the reinvite that we receive. This information is passed to the RTP layer so that it will know about the alternate source for media. Review: https://reviewboard.asterisk.org/r/252 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@197615 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-28Merged revisions 197543 via svnmerge from mmichelson1-1/+11
https://origsvn.digium.com/svn/asterisk/trunk ................ r197543 | mmichelson | 2009-05-28 09:58:06 -0500 (Thu, 28 May 2009) | 27 lines Merged revisions 197537 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r197537 | mmichelson | 2009-05-28 09:49:13 -0500 (Thu, 28 May 2009) | 21 lines Add flags to chanspy audiohook so that audio stays in sync. There are two flags being added to the chanspy audiohook here. One is the pre-existing AST_AUDIOHOOK_TRIGGER_SYNC flag. With this set, we ensure that the read and write slinfactories on the audiohook do not skew beyond a certain tolerance. In addition, there is a new audiohook flag added here, AST_AUDIOHOOK_SMALL_QUEUE. With this flag set, we do not allow for a slinfactory to build up a substantial amount of audio before flushing it. For this particular issue, this means that the person spying on the call will hear the conversations in real time with very little delay in the audio. (closes issue #13745) Reported by: geoffs Patches: 13745.patch uploaded by mmichelson (license 60) Tested by: snblitz ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@197544 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-28Merged revisions 197538 via svnmerge from file1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r197538 | file | 2009-05-28 11:51:43 -0300 (Thu, 28 May 2009) | 5 lines Fix a bug in stringfields where it did not actually free the pools of memory. (closes issue #15074) Reported by: pj ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@197539 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-27Fix broken attended transfersjpeeler1-5/+6
The bridge was terminating immediately after the attended transfer was completed. The problem was because upon reentering ast_channel_bridge nexteventts was checked to see if it was set and if so could possibly return AST_BRIDGE_COMPLETE. (closes issue #15183) Reported by: andrebarbosa Tested by: andrebarbosa, tootai, loloski git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@197126 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-21Merged revisions 195882 via svnmerge from mnicholson1-0/+24
https://origsvn.digium.com/svn/asterisk/trunk ................ r195882 | mnicholson | 2009-05-21 10:33:55 -0500 (Thu, 21 May 2009) | 20 lines Merged revisions 195881 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r195881 | mnicholson | 2009-05-21 10:25:50 -0500 (Thu, 21 May 2009) | 13 lines This commit prevents cdr records with AST_CDR_FLAG_ANSLOCKED and AST_CDR_FLAG_LOCKED from being updated in certain cases. This is accomplished by adding two functions to update the answer time and disposition of calls that checks for the proper lock flags. These functions are used in the ast_bridge_call() function so that ForkCDR(A) calls are respected. This patch also modifies the way ast_bridge_call() chooses the cdr record to base the bridged_cdr on. Previously the first unlocked cdr record would be chosen, now instead the first cdr record is chosen and forked cdr records are moved to the bridge_cdr. This allows the original cdr record and any forked cdr records to be properly updated with answer and end times. (closes issue #13797) Reported by: sh0t Tested by: sh0t (closes issue #14744) Reported by: deepesh ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@195894 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-20Merged revisions 195698 via svnmerge from file1-5/+11
https://origsvn.digium.com/svn/asterisk/trunk ................ r195698 | file | 2009-05-20 14:33:02 -0300 (Wed, 20 May 2009) | 12 lines Merged revisions 195688 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r195688 | file | 2009-05-20 14:30:25 -0300 (Wed, 20 May 2009) | 5 lines Fix some code that wrongly assumed a pointer would always be non-NULL when dealing with CDRs after a bridge. (closes issue #15079) Reported by: barryf ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@195702 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-18Merged revisions 195369 via svnmerge from eliel1-2/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r195369 | eliel | 2009-05-18 16:49:20 -0400 (Mon, 18 May 2009) | 8 lines Fix the CLI command 'manager show command' documentation and functionality. The CLI command 'manager show command' supports passing multiple action names in the same line, but it was not allowing that because of a incorrect check in the argumentes counter. Also the documentation was updated to show that this usage of the command is possible. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@195442 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-18Merged revisions 195320 via svnmerge from tilghman1-51/+52
https://origsvn.digium.com/svn/asterisk/trunk ........ r195320 | tilghman | 2009-05-18 14:17:15 -0500 (Mon, 18 May 2009) | 9 lines Move the spawn of astcanary down, until after the call to daemon(3). This avoids possible conflicts with the internal implementation of daemon(3). (closes issue #15093) Reported by: tzafrir Patches: 20090513__issue15093__2.diff.txt uploaded by tilghman (license 14) Tested by: tzafrir ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@195357 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-18Merged revisions 195207 via svnmerge from file1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r195207 | file | 2009-05-18 12:53:26 -0300 (Mon, 18 May 2009) | 14 lines Merged revisions 195206 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r195206 | file | 2009-05-18 12:51:22 -0300 (Mon, 18 May 2009) | 7 lines Fix a typo which caused loss of audio when using G729 in some scenarios with a smoother present. (closes issue #15105) Reported by: bamby Patches: process-vad-correctly.diff uploaded by bamby (license 430) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@195208 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-18Merged revisions 195162 via svnmerge from eliel1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r195162 | eliel | 2009-05-18 10:45:23 -0400 (Mon, 18 May 2009) | 9 lines Warn about the use of the application WaitExten() within a Macro(). Update applications documentation to warn the user about the use of the WaitExten() application within a Macro(). Recommend the use of Read() instead. (closes issue #14444) Reported by: ewieling ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@195177 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-18Merged revisions 195096 via svnmerge from file1-1/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r195096 | file | 2009-05-18 10:56:16 -0300 (Mon, 18 May 2009) | 12 lines Merged revisions 195095 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r195095 | file | 2009-05-18 10:53:39 -0300 (Mon, 18 May 2009) | 5 lines Fix a bug where the codecs of the called party leg were not properly sent back to the caller call leg when reinvited. (closes issue #13569) Reported by: bkw918 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@195097 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-18Merged revisions 195021 via svnmerge from russell1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r195021 | russell | 2009-05-18 07:59:11 -0500 (Mon, 18 May 2009) | 12 lines Recorded merge of revisions 195020 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r195020 | russell | 2009-05-18 07:57:46 -0500 (Mon, 18 May 2009) | 5 lines Don't try to unlock a bogus channel. (closes issue #15144) Reported by: cristiandimache ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@195022 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-13Recorded merge of revisions 194357 via svnmerge from mmichelson1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ................ r194357 | mmichelson | 2009-05-13 14:42:51 -0500 (Wed, 13 May 2009) | 18 lines Blocked revisions 194356 via svnmerge ........ r194356 | mmichelson | 2009-05-13 14:41:44 -0500 (Wed, 13 May 2009) | 13 lines Remove an extraneous unlocking operation from ast_channel_free. In the case that we could not remove the desired channel from the list of channels, there was an extra call to unlock the channel list. Since we unlock the list later on in the function anyway, this results in the list being unlocked twice yet only being locked once. (closes issue #15098) Reported by: tim_ringenbach Patches: remove_extra_unlock.diff uploaded by tim (license 540) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@194358 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-13Merged revisions 194209 via svnmerge from file1-23/+58
https://origsvn.digium.com/svn/asterisk/trunk ................ r194209 | file | 2009-05-13 10:39:10 -0300 (Wed, 13 May 2009) | 18 lines Merged revisions 194208 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r194208 | file | 2009-05-13 10:38:01 -0300 (Wed, 13 May 2009) | 11 lines Fix RFC2833 issues with DTMF getting duplicated and with duration wrapping over. (closes issue #14815) Reported by: geoff2010 Patches: v1-14815.patch uploaded by dimas (license 88) Tested by: geoff2010, file, dimas, ZX81, moliveras (closes issue #14460) Reported by: moliveras Tested by: moliveras ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@194211 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-13Merged revisions 194138 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r194138 | tilghman | 2009-05-12 19:52:49 -0500 (Tue, 12 May 2009) | 14 lines Merged revisions 194137 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r194137 | tilghman | 2009-05-12 19:52:03 -0500 (Tue, 12 May 2009) | 7 lines Fix logic for how to proceed with a single digit extension. (closes issue #15091) Reported by: andrew Patches: 20090512__issue15091.diff.txt uploaded by tilghman (license 14) Tested by: andrew ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@194139 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-08Merged revisions 193194 via svnmerge from kpfleming1-10/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r193194 | kpfleming | 2009-05-08 09:06:15 -0500 (Fri, 08 May 2009) | 13 lines Merged revisions 193193 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r193193 | kpfleming | 2009-05-08 09:03:28 -0500 (Fri, 08 May 2009) | 7 lines Make absolute paths for logger channels work properly (Note: This is not a new feature, it was previously undocumented and broken.) The Asterisk logger has a feature to support absolute pathnames for logger channels, but the code implementing the feature was broken. This has been fixed, and the absolute path feature is now documented in the sample logger.conf. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@193195 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-07Merged revisions 193120 via svnmerge from tilghman1-2/+17
https://origsvn.digium.com/svn/asterisk/trunk ................ r193120 | tilghman | 2009-05-07 18:42:28 -0500 (Thu, 07 May 2009) | 26 lines Merged revisions 193119 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r193119 | tilghman | 2009-05-07 18:41:11 -0500 (Thu, 07 May 2009) | 19 lines Fix Background within a Macro for FreePBX. If the single digit DTMF is an extension in the specified context, then go there and signal no DTMF. Otherwise, we should exit with that DTMF. If we're in Macro, we'll exit and seek that DTMF as the beginning of an extension in the Macro's calling context. If we're not in Macro, then we'll simply seek that extension in the calling context. Previously, someone complained about the behavior as it related to the interior of a Gosub routine, and the fix (#14011) inadvertently broke FreePBX (#14940). This change should fix both of these situations, but with the possible incompatibility that if a single digit extension does not exist (but a longer extension COULD have matched), it would have previously gone immediately to the "i" extension, but will now need to wait for a timeout. (closes issue #14940) Reported by: p_lindheimer Patches: 20090420__bug14940.diff.txt uploaded by tilghman (license 14) Tested by: p_lindheimer ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@193121 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-06Merged revisions 192861 via svnmerge from jpeeler1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r192861 | jpeeler | 2009-05-06 17:17:27 -0500 (Wed, 06 May 2009) | 17 lines Merged revisions 192858 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r192858 | jpeeler | 2009-05-06 17:15:19 -0500 (Wed, 06 May 2009) | 10 lines Make ParkedCall application stop execution of the dialplan after hang up Just changed park_exec to always return non-zero. I really wasn't entirely sure at first if this was a bug. Decided it was since it would be surprising when not using ParkedCall in the dialplan to hang up and have dialplan execution continue. (closes issue #14555) Reported by: francesco_r ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@192865 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-05Merged revisions 192462 via svnmerge from file1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r192462 | file | 2009-05-05 15:23:58 -0300 (Tue, 05 May 2009) | 15 lines Merged revisions 192454 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r192454 | file | 2009-05-05 15:22:27 -0300 (Tue, 05 May 2009) | 8 lines Fix an incorrect assumption that certain values on the channel will always exist when they may not. The CDR code involved with bridges wrongly assumed that the currently executing application and data values will always exist. It is possible for this to be false when call forwarding is involved. (closes issue #14984) Reported by: gincantalupo ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@192467 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-05Merged revisions 192357 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r192357 | kpfleming | 2009-05-05 15:18:21 +0200 (Tue, 05 May 2009) | 5 lines Correct some flaws in the memory accounting code for stringfields and ao2 objects Under some conditions, the memory allocation for stringfields and ao2 objects would not have supplied valid file/function names for MALLOC_DEBUG tracking, so this commit corrects that. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@192358 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-05Merged revisions 192318 via svnmerge from kpfleming1-7/+66
https://origsvn.digium.com/svn/asterisk/trunk ........ r192318 | kpfleming | 2009-05-05 12:34:19 +0200 (Tue, 05 May 2009) | 5 lines Properly account for memory allocated for channels and datastores As in previous commits, when channels are allocated (with ast_channel_alloc) or datastores are allocated (with ast_datastore_alloc) properly account for the memory being owned by the caller, instead of the allocator function itself. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@192353 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-05Merged revisions 192279 via svnmerge from kpfleming1-20/+49
https://origsvn.digium.com/svn/asterisk/trunk ........ r192279 | kpfleming | 2009-05-05 10:51:06 +0200 (Tue, 05 May 2009) | 5 lines Ensure that string pools allocated to hold stringfields are properly accounted in MALLOC_DEBUG mode This commit modifies the stringfield pool allocator to remember the 'owner' of the stringfield manager the pool is being allocated for, and ensures that pools allocated in the future when fields are populated are owned by that file/function. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@192280 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-02Merged revisions 191775 via svnmerge from kpfleming1-2/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r191775 | kpfleming | 2009-05-02 20:39:48 +0200 (Sat, 02 May 2009) | 5 lines Fix an error in queue_log file rotation optimization code This code was copy-and-pasted without properly changing references to event_rotate into queue_rotate, so under some conditions the log rotation would rotate queue_log even though it was not necessary. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@191776 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-02Merged revisions 191700 via svnmerge from seanbright1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r191700 | seanbright | 2009-05-02 11:45:07 -0400 (Sat, 02 May 2009) | 1 line Update copyright year to 2009 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@191701 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-01Merged revisions 191489 via svnmerge from jpeeler1-1/+20
https://origsvn.digium.com/svn/asterisk/trunk ................ r191489 | jpeeler | 2009-05-01 13:09:23 -0500 (Fri, 01 May 2009) | 15 lines Merged revisions 191488 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r191488 | jpeeler | 2009-05-01 12:40:46 -0500 (Fri, 01 May 2009) | 9 lines Fix DTMF not being sent to other side after a partial feature match This fixes a regression from commit 176701. The issue was that ast_generic_bridge never exited after the feature digit timeout had elapsed, which prevented the queued DTMF from being sent to the other side. This issue was reported to me directly. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@191499 f38db490-d61c-443f-a65b-d21fe96a405b