aboutsummaryrefslogtreecommitdiffstats
path: root/main
AgeCommit message (Collapse)AuthorFilesLines
2009-08-28Merged revisions 214702 via svnmerge from tilghman1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r214702 | tilghman | 2009-08-28 15:14:39 -0500 (Fri, 28 Aug 2009) | 15 lines Merged revisions 214701 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r214701 | tilghman | 2009-08-28 15:13:32 -0500 (Fri, 28 Aug 2009) | 8 lines Modify comment to be a bit more accurate. We have kept this comment around long enough, that it's pretty clear that we're keeping the code, because changing the code would require a pretty fundamental architectural shift. We've also taken criticism in some quarters, because it was believed that it was referring to the code being nasty. No, the code isn't nasty, just the operation itself is rather odd. Fixed for eternity (probably not). ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@214707 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-27Merged revisions 214514 via svnmerge from tilghman1-5/+17
https://origsvn.digium.com/svn/asterisk/trunk ........ r214514 | tilghman | 2009-08-27 16:26:37 -0500 (Thu, 27 Aug 2009) | 7 lines Ensure that we check for the special value CONFIG_STATUS_FILEINVALID. (closes issue #15786) Reported by: a_villacis Patches: asterisk-1.6.2.0-beta4-manager-fix-crash-on-include-nonexistent-file.patch uploaded by a villacis (license 660) (Plus a few of my own, to catch the remaining places within manager.c where it could have been a problem) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@214515 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-26Merged revisions 214195 via svnmerge from dvossel1-2/+25
https://origsvn.digium.com/svn/asterisk/trunk ................ r214195 | dvossel | 2009-08-26 11:38:53 -0500 (Wed, 26 Aug 2009) | 25 lines Merged revisions 214194 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r214194 | dvossel | 2009-08-26 11:36:42 -0500 (Wed, 26 Aug 2009) | 19 lines ast_write() ignores ast_audiohook_write() results In ast_write(), if a channel has a list of audiohooks, those lists are written to and the resulting frame is what ast_write() should continue with. The problem was the returned audiohook frame was not being handled at all, and the original frame passed into it did not contain the mixed audio, so essentially audio was being lost. One result of this was chan_spy's whisper mode no longer worked. To complicate the issue, frames passed into ast_write may either be a single frame, or a list of frames. So, as the list of frames is processed in the audiohook_write, the returned frames had to be added to a new list. (closes issue #15660) Reported by: corruptor Tested by: dvossel ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@214196 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-25Merged revisions 214071 via svnmerge from tilghman1-8/+17
https://origsvn.digium.com/svn/asterisk/trunk ................ r214071 | tilghman | 2009-08-25 14:32:48 -0500 (Tue, 25 Aug 2009) | 17 lines Merged revisions 214068-214069 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r214068 | tilghman | 2009-08-25 14:26:50 -0500 (Tue, 25 Aug 2009) | 6 lines Fix pronunciation of German dates. (closes issue #15273) Reported by: Benjamin Kluck Patches: say_c.patch uploaded by Benjamin Kluck (license 803) ........ r214069 | tilghman | 2009-08-25 14:28:42 -0500 (Tue, 25 Aug 2009) | 2 lines I should always compile before committing... ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@214074 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-25Merged revisions 213971 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r213971 | tilghman | 2009-08-25 01:35:37 -0500 (Tue, 25 Aug 2009) | 14 lines Merged revisions 213970 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r213970 | tilghman | 2009-08-25 01:34:44 -0500 (Tue, 25 Aug 2009) | 7 lines Improve error message by informing user exactly which function is missing a parethesis. (closes issue #15242) Reported by: Nick_Lewis Patches: pbx.c-funcparenthesis.patch2 uploaded by dbrooks (license 790) pbx.c-funcparenthesis-1.4.diff uploaded by loloski (license 68) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@213974 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-21Merged revisions 213450 via svnmerge from twilson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r213450 | twilson | 2009-08-20 22:48:54 -0500 (Thu, 20 Aug 2009) | 2 lines Make LOAD_ORDER actually work ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@213453 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-20Merged revisions 213327 via svnmerge from mnicholson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r213327 | mnicholson | 2009-08-20 15:29:32 -0500 (Thu, 20 Aug 2009) | 7 lines Fix a crash by checking the proper pointer for validity before deferencing it. (closes issue #15751) Reported by: atis Patches: ast_bridge_call_peer_cdr.patch uploaded by atis (license 242) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@213350 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-19Merged revisions 213179 via svnmerge from qwell2-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r213179 | qwell | 2009-08-19 17:38:46 -0500 (Wed, 19 Aug 2009) | 5 lines Fix compile when certain G711 menuselect options are enabled. (closes issue #15697) Reported by: slavon ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@213182 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-19Merged revisions 213046 via svnmerge from russell1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r213046 | russell | 2009-08-19 10:32:18 -0500 (Wed, 19 Aug 2009) | 4 lines Don't blow up on a NULL cdr. Reported in #asterisk-dev. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@213047 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-18Merged revisions 212764 via svnmerge from seanbright1-1/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r212764 | seanbright | 2009-08-18 12:38:36 -0400 (Tue, 18 Aug 2009) | 18 lines Merged revisions 212763 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r212763 | seanbright | 2009-08-18 12:36:00 -0400 (Tue, 18 Aug 2009) | 11 lines Delay the creation of temporary files until we have a valid manager command to handle. Without this patch, asterisk creates a temporary file before determining if the specified command is valid. If invalid, we weren't properly cleaning up the file. (closes issue #15730) Reported by: zmehmood Patches: M15730.diff uploaded by junky (license 177) Tested by: zmehmood ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@212767 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-17Merged revisions 212574 via svnmerge from seanbright1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r212574 | seanbright | 2009-08-17 14:18:16 -0400 (Mon, 17 Aug 2009) | 8 lines Correct the return value check for ast_safe_system. The logic here was reversed as ast_safe_system returns -1 on error and not on success. Fix suggested by reporter. (closes issue #15667) Reported by: loic ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@212580 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-10AST-2009-005tilghman18-70/+70
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@211580 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-09Merged revisions 211275 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r211275 | tilghman | 2009-08-09 10:42:02 -0500 (Sun, 09 Aug 2009) | 9 lines Merged revisions 211274 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r211274 | tilghman | 2009-08-09 10:41:01 -0500 (Sun, 09 Aug 2009) | 2 lines Small oops. Clear the flags which have been checked. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@211278 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-07Merged revisions 210992 via svnmerge from kpfleming1-5/+9
https://origsvn.digium.com/svn/asterisk/trunk ........ r210992 | kpfleming | 2009-08-07 08:08:00 -0500 (Fri, 07 Aug 2009) | 13 lines Workaround broken T.38 endpoints that offer tiny MaxDatagram sizes. Some T.38 endpoints treat T38FaxMaxDatagram as the maximum IFP size that should be sent to them, rather than the maximum packet payload size. If such an endpoint also requests UDPRedundancy as the error correction mode, we'll end up calculating a tiny maximum IFP size, so small as to be unusable. This patch sets a lower bound on what we'll consider the remote's maximum IFP size to be, assuming that endpoints that do this really can accept larger packets than they've offered to accept. (closes issue #15649) Reported by: dazza76 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@210995 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-06Merged revisions 210914 via svnmerge from tilghman1-0/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r210914 | tilghman | 2009-08-06 16:46:01 -0500 (Thu, 06 Aug 2009) | 14 lines Merged revisions 210913 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r210913 | tilghman | 2009-08-06 16:45:01 -0500 (Thu, 06 Aug 2009) | 7 lines Because channel information can be accessed outside of the channel thread, we must lock the channel prior to modifying it. (closes issue #15397) Reported by: caspy Patches: 20090714__issue15397.diff.txt uploaded by tilghman (license 14) Tested by: caspy ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@210917 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-06Merged revisions 210908 via svnmerge from tilghman1-6/+21
https://origsvn.digium.com/svn/asterisk/trunk ........ r210908 | tilghman | 2009-08-06 16:29:26 -0500 (Thu, 06 Aug 2009) | 9 lines Allow Gosub to recognize quote delimiters without consuming them. (closes issue #15557) Reported by: rain Patches: 20090723__issue15557.diff.txt uploaded by tilghman (license 14) Tested by: rain Review: https://reviewboard.asterisk.org/r/316/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@210911 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-03Merged revisions 210190 via svnmerge from kpfleming1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r210190 | kpfleming | 2009-08-03 15:48:48 -0500 (Mon, 03 Aug 2009) | 11 lines Rename 'canreinvite' option to 'directmedia', with backwards compatibility. It is clear from multiple mailing list, forum, wiki and other sorts of posts that users don't really understand the effects that the 'canreinvite' config option actually has, and that in some cases they think that setting it to 'no' will actually cause various other features (T.38, MOH, etc.) to not work properly, when in fact this is not the case. This patch changes the proper name of the option to what it should have been from the beginning ('directmedia'), but preserves backwards compatibility for existing configurations. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@210191 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-01Merged revisions 209887 via svnmerge from russell1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r209887 | russell | 2009-08-01 06:29:25 -0500 (Sat, 01 Aug 2009) | 12 lines Merged revisions 209879 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r209879 | russell | 2009-08-01 06:27:25 -0500 (Sat, 01 Aug 2009) | 5 lines Resolve a valgrind warning about a read from uninitialized memory. (issue #15396) Reported by: aragon ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@209906 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-01Merged revisions 209835 via svnmerge from russell1-2/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r209835 | russell | 2009-08-01 05:43:40 -0500 (Sat, 01 Aug 2009) | 6 lines Fix ast_event_queue_and_cache() to actually do the cache() part. (closes issue #15624) Reported by: ffossard Tested by: russell ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@209837 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-01Merged revisions 209760-209761 via svnmerge from kpfleming2-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r209760 | kpfleming | 2009-07-31 20:03:07 -0500 (Fri, 31 Jul 2009) | 13 lines Merged revisions 209759 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r209759 | kpfleming | 2009-07-31 19:52:00 -0500 (Fri, 31 Jul 2009) | 7 lines Minor changes inspired by testing with latest GCC. The latest GCC (what will become 4.5.x) has a few new warnings, that in these cases found some either downright buggy code, or at least seriously poorly designed code that could be improved. ........ ................ r209761 | kpfleming | 2009-07-31 20:04:06 -0500 (Fri, 31 Jul 2009) | 1 line Revert accidental Makefile change. ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@209816 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-31Merged revisions 209711 via svnmerge from russell1-9/+9
https://origsvn.digium.com/svn/asterisk/trunk ........ r209711 | russell | 2009-07-31 16:53:31 -0500 (Fri, 31 Jul 2009) | 2 lines Fix some places where ast_event_type was used instead of ast_event_ie_type. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@209715 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-27Merged revisions 209235 via svnmerge from mmichelson1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r209235 | mmichelson | 2009-07-27 15:54:54 -0500 (Mon, 27 Jul 2009) | 5 lines Gracefully handle malformed RTP text packets. AST-2009-004 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@209238 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-27Merged revisions 209098 via svnmerge from dbrooks2-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r209098 | dbrooks | 2009-07-27 11:33:50 -0500 (Mon, 27 Jul 2009) | 6 lines Fixing typos. Replaces "recieved" with "received" and "initilize" with "initialize" (closes issue #15571) Reported by: alecdavis ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@209234 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-27Merged revisions 209132 via svnmerge from mmichelson1-1/+22
https://origsvn.digium.com/svn/asterisk/trunk ................ r209132 | mmichelson | 2009-07-27 12:50:04 -0500 (Mon, 27 Jul 2009) | 24 lines Merged revisions 209131 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r209131 | mmichelson | 2009-07-27 12:44:06 -0500 (Mon, 27 Jul 2009) | 18 lines Allow for UDPTL to use only even-numbered ports if desired. There are some VoIP providers out there that will not accept SDP offers with odd numbered UDPTL ports. While it is my personal opinion that these VoIP providers are misinterpreting RFC 2327, it really is not a big deal to play along with their silly little games. Of course, since restricting UDPTL ports to only even numbers reduces the range of available ports by half, so the option to use only even port numbers is off by default. A user can enable the behavior by setting use_even_ports=yes in udptl.conf. (closes issue #15182) Reported by: CGMChris Patches: 15182.patch uploaded by mmichelson (license 60) Tested by: CGMChris ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@209135 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-27Merged revisions 208924 via svnmerge from jpeeler1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r208924 | jpeeler | 2009-07-26 20:20:37 -0500 (Sun, 26 Jul 2009) | 9 lines Merged revisions 208923 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r208923 | jpeeler | 2009-07-26 20:18:31 -0500 (Sun, 26 Jul 2009) | 2 lines Fix logic errors from 208746 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@208927 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-25Merged revisions 208813 via svnmerge from mvanbaak1-5/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r208813 | mvanbaak | 2009-07-25 14:03:25 +0200 (Sat, 25 Jul 2009) | 10 lines add default alias reload to run module reload. Requiring 'module reload' to reload everything, including core etc makes russell very unhappy. The default configuration already loads the 'friendly' aliases template. Added 'reload=module reload' to that template. Also removed the comment in main/cli.c that reload should come back. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@208816 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-25Merged revisions 208749 via svnmerge from jpeeler1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ................ r208749 | jpeeler | 2009-07-25 01:23:18 -0500 (Sat, 25 Jul 2009) | 13 lines Merged revisions 208746 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r208746 | jpeeler | 2009-07-25 01:19:50 -0500 (Sat, 25 Jul 2009) | 7 lines Fix compiling under dev-mode with gcc 4.4.0. Mostly trivial changes, but I did not know of any other way to fix the "dereferencing type-punned pointer will break strict-aliasing rules" error without creating a tmp variable in chan_skinny. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@208755 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-24Merged revisions 208706 via svnmerge from russell1-0/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r208706 | russell | 2009-07-24 15:54:37 -0500 (Fri, 24 Jul 2009) | 6 lines Note that "reload" needs to be added back. I keep getting annoyed at having to type "module reload" to reload everything, so I'm adding a note that we need to add "reload" back. "module reload" doesn't really make sense as the command to reload everything, including the core. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@208707 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-24Merged revisions 208693 via svnmerge from russell1-1/+0
https://origsvn.digium.com/svn/asterisk/trunk ........ r208693 | russell | 2009-07-24 15:25:23 -0500 (Fri, 24 Jul 2009) | 2 lines Don't log a warning for something that does not affect operation. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@208695 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-24Merged revisions 208548 via svnmerge from kpfleming1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r208548 | kpfleming | 2009-07-24 10:02:53 -0500 (Fri, 24 Jul 2009) | 8 lines Resolve a T.38 negotiation issue left over from the udptl-updates merge. The udptl-updates branch that was merged yesterday failed to properly send back T.38 SDP responses with the correct error correction mode, if the incoming SDP from the other end caused us to change error correction modes. This patch corrects that situation. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@208551 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-23Merged revisions 208464 via svnmerge from kpfleming4-120/+180
https://origsvn.digium.com/svn/asterisk/trunk ........ r208464 | kpfleming | 2009-07-23 16:57:24 -0500 (Thu, 23 Jul 2009) | 46 lines Rework of T.38 negotiation and UDPTL API to address interoperability problems Over the past couple of months, a number of issues with Asterisk negotiating (and successfully completing) T.38 sessions with various endpoints have been found. This patch attempts to address many of them, primarily focused around ensuring that the endpoints' MaxDatagram size is honored, and in addition by ensuring that T.38 session parameter negotiation is performed correctly according to the ITU T.38 Recommendation. The major changes here are: 1) T.38 applications in Asterisk (app_fax) only generate/receive IFP packets, they do not ever work with UDPTL packets. As a result of this, they cannot be allowed to generate packets that would overflow the other endpoints' MaxDatagram size after the UDPTL stack adds any error correction information. With this patch, the application is told the maximum *IFP* size it can generate, based on a calculation using the far end MaxDatagram size and the active error correction mode on the T.38 session. The same is true for sending *our* MaxDatagram size to the remote endpoint; it is computed from the value that the application says it can accept (for a single IFP packet) combined with the active error correction mode. 2) All treatment of T.38 session parameters as 'capabilities' in chan_sip has been removed; these parameters are not at all like audio/video stream capabilities. There are strict rules to follow for computing an answer to a T.38 offer, and chan_sip now follows those rules, using the desired parameters from the application (or channel) that wants to accept the T.38 negotiation. 3) chan_sip now stores and forwards ast_control_t38_parameters structures for tracking 'our' and 'their' T.38 session parameters; this greatly simplifies negotiation, especially for pass-through calls. 4) Since T.38 negotiation without specifying parameters or receiving the final negotiated parameters is not very worthwhile, the AST_CONTROL_T38 control frame has been removed. A note has been added to UPGRADE.txt about this removal, since any out-of-tree applications that use it will no longer function properly until they are upgraded to use AST_CONTROL_T38_PARAMETERS. Review: https://reviewboard.asterisk.org/r/310/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@208501 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-21Merged revisions 207723 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r207723 | mmichelson | 2009-07-21 09:29:40 -0500 (Tue, 21 Jul 2009) | 11 lines Merged revisions 207714 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r207714 | mmichelson | 2009-07-21 09:26:00 -0500 (Tue, 21 Jul 2009) | 5 lines Document default timeout for AMI originations. AST-224 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@207727 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-21Merged revisions 207680 via svnmerge from kpfleming2-8/+8
https://origsvn.digium.com/svn/asterisk/trunk ................ r207680 | kpfleming | 2009-07-21 08:28:04 -0500 (Tue, 21 Jul 2009) | 18 lines Merged revisions 207647 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r207647 | kpfleming | 2009-07-21 08:04:44 -0500 (Tue, 21 Jul 2009) | 12 lines Ensure that user-provided CFLAGS and LDFLAGS are honored. This commit changes the build system so that user-provided flags (in ASTCFLAGS and ASTLDFLAGS) are supplied to the compiler/linker *after* all flags provided by the build system itself, so that the user can effectively override the build system's flags if desired. In addition, ASTCFLAGS and ASTLDFLAGS can now be provided *either* in the environment before running 'make', or as variable assignments on the 'make' command line. As a result, the use of COPTS and LDOPTS is no longer necessary, so they are no longer documented, but are still supported so as not to break existing build systems that supply them when building Asterisk. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@207685 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-20Merged revisions 207361 via svnmerge from russell1-6/+11
https://origsvn.digium.com/svn/asterisk/trunk ................ r207361 | russell | 2009-07-20 11:36:15 -0500 (Mon, 20 Jul 2009) | 16 lines Merged revisions 207360 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r207360 | russell | 2009-07-20 11:26:24 -0500 (Mon, 20 Jul 2009) | 9 lines Only do the chan->fdno check in ast_read() in a developer build. I changed this check to only happen in a dev-mode build. I also added a comment explaining what is going on. I also made it so that detection of this situation does not affect ast_read() operation. (closes issue #14723) Reported by: seadweller ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@207364 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-16Merged revisions 206868 via svnmerge from dvossel1-0/+3
https://origsvn.digium.com/svn/asterisk/trunk ................ r206868 | dvossel | 2009-07-16 16:25:22 -0500 (Thu, 16 Jul 2009) | 14 lines Merged revisions 206867 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r206867 | dvossel | 2009-07-16 16:24:16 -0500 (Thu, 16 Jul 2009) | 8 lines avoid segfault caused by user error If the CALLERPRES() dialplan function is set to nothing, a segfault occurs. This is user error to begin with, but I'd rather see a cli warning message than have Asterisk crash on me. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@206869 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-10Merged revisions 205939 via svnmerge from kpfleming1-5/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r205939 | kpfleming | 2009-07-10 13:44:09 -0500 (Fri, 10 Jul 2009) | 1 line Update comments about the level of T.38 support in Asterisk. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@205942 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-09Merged revisions 205479 via svnmerge from dvossel1-19/+25
https://origsvn.digium.com/svn/asterisk/trunk ................ r205479 | dvossel | 2009-07-08 18:19:09 -0500 (Wed, 08 Jul 2009) | 16 lines Merged revisions 205471 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r205471 | dvossel | 2009-07-08 18:15:54 -0500 (Wed, 08 Jul 2009) | 10 lines Fixes 8khz assumptions Many calculations assume 8khz is the codec rate. This is not always the case. This patch only addresses chan_iax.c and res_rtp_asterisk.c, but I am sure there are other areas that make this assumption as well. Review: https://reviewboard.asterisk.org/r/306/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@205595 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-09Merged revisions 205532 via svnmerge from mvanbaak1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r205532 | mvanbaak | 2009-07-09 10:31:24 +0200 (Thu, 09 Jul 2009) | 5 lines pthread_self returns a pthread_t which is not an unsigned int on all pthread implementations. Casting it to an unsigned int fixes compiler warnings. Tested on OpenBSD and Linux both 32 and 64 bit ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@205535 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-08Merged revisions 205412 via svnmerge from dvossel2-25/+26
https://origsvn.digium.com/svn/asterisk/trunk ................ r205412 | dvossel | 2009-07-08 17:15:06 -0500 (Wed, 08 Jul 2009) | 12 lines Merged revisions 205409 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r205409 | dvossel | 2009-07-08 16:35:12 -0500 (Wed, 08 Jul 2009) | 6 lines moving ast_devstate_to_extenstate to pbx.c from devicestate.c ast_devstate_to_extenstate belongs in pbx.c. This change fixes a compile time error with chan_vpb as well. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@205413 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-08Merged revisions 205410 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r205410 | dvossel | 2009-07-08 17:02:54 -0500 (Wed, 08 Jul 2009) | 3 lines missing comma in devstatestring array ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@205411 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-08Merged revisions 205254 via svnmerge from dbrooks1-8/+21
https://origsvn.digium.com/svn/asterisk/trunk ........ r205254 | dbrooks | 2009-07-08 12:26:26 -0500 (Wed, 08 Jul 2009) | 8 lines Fixes Park() argument handling Park() was not respecting the arguments passed to it. Any extension/context/priority given to it was being ignored. This patch remedies this. (closes issue #15380) Reported by: DLNoah ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@205287 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-08oops, fixing buildtilghman1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@205223 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-08Merged revisions 205196 via svnmerge from tilghman1-0/+72
https://origsvn.digium.com/svn/asterisk/trunk ................ r205196 | tilghman | 2009-07-08 11:27:50 -0500 (Wed, 08 Jul 2009) | 9 lines Merged revisions 205188 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r205188 | tilghman | 2009-07-08 11:26:15 -0500 (Wed, 08 Jul 2009) | 2 lines Add redirection warnings for the invalid language codes previously removed. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@205207 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-08Merged revisions 205151 via svnmerge from russell1-29/+29
https://origsvn.digium.com/svn/asterisk/trunk ........ r205151 | russell | 2009-07-08 10:56:28 -0500 (Wed, 08 Jul 2009) | 2 lines Use tabs instead of spaces for indentation. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@205154 f38db490-d61c-443f-a65b-d21fe96a405b
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.2@205148 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.2@204951 f38db490-d61c-443f-a65b-d21fe96a405b
2009-07-02Merged revisions 204710 via svnmerge from dvossel2-51/+75
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.2@204711 f38db490-d61c-443f-a65b-d21fe96a405b
2009-06-30Merged revisions 204563 via svnmerge from tilghman1-212/+206
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.2@204611 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.2@204478 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.2@204473 f38db490-d61c-443f-a65b-d21fe96a405b