aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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
2009-01-21Merged revisions 169611 via svnmerge from mmichelson1-2/+2
https://origsvn.digium.com/svn/asterisk/trunk ........ r169611 | mmichelson | 2009-01-20 18:33:32 -0600 (Tue, 20 Jan 2009) | 22 lines Fix device state parsing issues for channel names with multiple slashes The fix being applied is a bit different for trunk and the 1.6.X branches. For trunk, we only wish to strip off the characters beyond the second slash if the channel is a Local channel (i.e. we are removing the /n from the device name). Other channel technologies with multiple slashes (e.g. DAHDI) need the information after the second slash in order to get the proper device state information. In addition to this fix, the 1.6.X branches are receiving a much more important fix as well. The problem in 1.6.X is that the member's device name was being directly changed instead of having a copy changed. This meant that we would strip off the second slash and trailing characters and then leave the member's device name like that permanently thereafter. (closes issue #14014) Reported by: kebl0155 Patches: 14014_number2.patch uploaded by putnopvut (license 60) Tested by: kebl0155 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169613 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-20Merged revisions 169574 via svnmerge from mmichelson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r169574 | mmichelson | 2009-01-20 15:57:24 -0600 (Tue, 20 Jan 2009) | 6 lines Use the default timeout for a queue instead of -1 (closes issue #14272) Reported by: timking ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169575 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-20Merged revisions 169557 via svnmerge from mmichelson1-72/+85
https://origsvn.digium.com/svn/asterisk/trunk ........ r169557 | mmichelson | 2009-01-20 14:10:31 -0600 (Tue, 20 Jan 2009) | 19 lines Convert the character pointers in a sip_request to be pointer offsets When an ast_str expands to hold more data, any pointers that were pointing to the data prior to the expansion will be pointing at invalid memory. This change makes such pointers used in chan_sip.c instead be offsets from the beginning of the string so that the same math may be applied no matter where in memory the string resides. To help ease this transition, a macro called REQ_OFFSET_TO_STR has been added to chan_sip.c so that given a sip_request and an offset, the string at that offset is returned. (closes issue #14220) Reported by: riksta Tested by: putnopvut Review http://reviewboard.digium.com/r/126/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169559 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-20Merged revisions 169510 via svnmerge from twilson1-2/+24
https://origsvn.digium.com/svn/asterisk/trunk ........ r169510 | twilson | 2009-01-20 13:22:24 -0600 (Tue, 20 Jan 2009) | 7 lines Make a proper builtin attended transfer to parking work This is an ugly hack from 1.4 that allows the timeout callback from a parked call to use the right channel name for the callback when the park is done with a builtin attended transfer (that isn't completed early). This hasn't ever worked in trunk and no one has complained yet, so eh. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169554 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-20Merged revisions 169486 via svnmerge from twilson1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r169486 | twilson | 2009-01-20 12:48:14 -0600 (Tue, 20 Jan 2009) | 13 lines Merged revisions 169485 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r169485 | twilson | 2009-01-20 12:40:56 -0600 (Tue, 20 Jan 2009) | 6 lines Don't play audio to the channel if we've masqueraded (closes issue #14066) Reported by: bluefox Tested by: otherwiseguy, bluefox ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169488 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-19Blocked revisions 169438 via svnmergekpfleming0-0/+0
........ r169438 | kpfleming | 2009-01-19 15:42:46 -0600 (Mon, 19 Jan 2009) | 5 lines ast_str_SQLGetData is *not* part of the ast_str API, it's part of the ast_odbc API and just happens to use an ast_str as the buffer; move all of it to res_odbc.c and res_odbc.h, renaming appropriately along the way fix some minor coding style issues in strings.h and add some attribute_pure annotations to functions in the ast_str API ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169439 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-19Merged revisions 169365 via svnmerge from tilghman2-14/+18
https://origsvn.digium.com/svn/asterisk/trunk ................ r169365 | tilghman | 2009-01-19 14:05:52 -0600 (Mon, 19 Jan 2009) | 11 lines Merged revisions 169364 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r169364 | tilghman | 2009-01-19 13:49:25 -0600 (Mon, 19 Jan 2009) | 4 lines Truncate userevents at the end of a line, when the command exceeds the buffer. (closes issue #14278) Reported by: fnordian ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169368 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-19Merged revisions 169211 via svnmerge from mmichelson1-4/+4
https://origsvn.digium.com/svn/asterisk/trunk ................ r169211 | mmichelson | 2009-01-19 09:54:06 -0600 (Mon, 19 Jan 2009) | 21 lines Merged revisions 169210 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r169210 | mmichelson | 2009-01-19 09:52:15 -0600 (Mon, 19 Jan 2009) | 13 lines Prevent a crash in chan_local due to a potential NULL pointer dereference Move the check for if both channels on a local_pvt have generators to below where p->chan is checked for NULLity (NULLness?). This prevents a crash from occurring if p->chan is NULL. (closes issue #14189) Reported by: sascha Patches: 14189.patch uploaded by putnopvut (license 60) Tested by: sascha ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169213 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-17Add discriminator for when ring pulse alert signal is used to preface MWI spillsdbailey2-16/+38
This prevents the situation when MWI messages are added to caller ID spills causing the channel to be hung up git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169154 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-17Merged revisions 169080 via svnmerge from twilson3-13/+13
https://origsvn.digium.com/svn/asterisk/trunk ........ r169080 | twilson | 2009-01-16 19:56:36 -0600 (Fri, 16 Jan 2009) | 8 lines Fix qualify for TCP peer (closes issue #14192) Reported by: pabelanger Patches: asterisk-bug14192.diff.txt uploaded by jamesgolovich (license 176) Tested by: jamesgolovich ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169082 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-17Merged revisions 169044 via svnmerge from twilson1-6/+5
https://origsvn.digium.com/svn/asterisk/trunk ........ r169044 | twilson | 2009-01-16 18:03:39 -0600 (Fri, 16 Jan 2009) | 8 lines Fix port :0 added to SIP INVITE URI when outboundproxy used (closes issue #14233) Reported by: chris-mac Patches: asterisk-bug14233.diff.txt uploaded by jamesgolovich (license 176) Tested by: jamesgolovich, chris-mac, otherwiseguy ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@169079 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-16Merged revisions 168941 via svnmerge from twilson1-22/+29
https://origsvn.digium.com/svn/asterisk/trunk ................ r168941 | twilson | 2009-01-16 16:16:23 -0600 (Fri, 16 Jan 2009) | 19 lines Merged revisions 168716 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168716 | twilson | 2009-01-15 12:22:49 -0600 (Thu, 15 Jan 2009) | 12 lines Convert call to park_call_full to masq_park_call_announce Since we removed the AST_PBX_KEEPALIVE return value, we need to use masqueraded parking, otherwise we will try to call ast_hangup() in __pbx_run() and in do_parking_thread() and then promptly crash. (closes issue #14215) Reported by: waverly360 Tested by: otherwiseguy (closes issue #14228) Reported by: kobaz Tested by: otherwiseguy ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168981 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-16Merged revisions 168976 via svnmerge from mmichelson1-1/+5
https://origsvn.digium.com/svn/asterisk/trunk ................ r168976 | mmichelson | 2009-01-16 16:43:09 -0600 (Fri, 16 Jan 2009) | 26 lines Merged revisions 168975 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168975 | mmichelson | 2009-01-16 16:42:13 -0600 (Fri, 16 Jan 2009) | 18 lines Account for possible NULL pointer when we receive a 408 in response to a REGISTER It may be that by the time we receive a reply to a REGISTER request, the attempt has timed out and thus the registry structure pointed to by the corresponding sip_pvt has gone away. This situation was handled properly for a 200 OK response, but the 408 case assumed that the sip_registry struct was non-NULL, thus potentially causing a crash This commit fixes this assumption and prints out a message to the console if we should receive a late 408 response to a REGISTER (closes issue #14211) Reported by: aborghi Patches: 14211.diff uploaded by putnopvut (license 60) Tested by: aborghi ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168979 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-16Blocked revisions 168898 via svnmergemmichelson0-0/+0
........ r168898 | mmichelson | 2009-01-16 13:54:39 -0600 (Fri, 16 Jan 2009) | 26 lines Fix a logic error that occur when using the timerfd interface This sequence of events posed a problem timerfd_timer_open timerfd_timer_enable_continuous timerfd_timer_set_rate timerfd_timer_disable_continuous The reason was that the timing module was written under the assumption that timerfd_timer_set_rate would not be called between enabling and disabling continuous mode. What happened in this situation was that timerfd_timer_enable_continuous saved off our previously set timer (in this situation a 0 timer, meaning it never runs out). Then timerfd_timer_disable_continuous would restore this 0 timer, even though it logically should set the timer to be whatever was set in timerfd_timer_set_rate. Now the behavior in timerfd_timer_set_rate is to overwrite the saved timer that may or may not have been set in timerfd_timer_enable_continuous. Even if timerfd_timer_enable_continuous has not been previously called, this will not harm the operation. Thanks to Terry Wilson for discovering the problem and giving me a really great debug capture that pointed out the problem clearly ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168899 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-16Merged revisions 168832 via svnmerge from tilghman3-146/+211
https://origsvn.digium.com/svn/asterisk/trunk ................ r168832 | tilghman | 2009-01-16 12:49:09 -0600 (Fri, 16 Jan 2009) | 13 lines Merged revisions 168828 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168828 | tilghman | 2009-01-16 12:41:35 -0600 (Fri, 16 Jan 2009) | 6 lines Fix the conjugation of Russian and Ukrainian languages. (related to issue #12475) Reported by: chappell Patches: vm_multilang.patch uploaded by chappell (license 8) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168836 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-16Merged revisions 168746 via svnmerge from murf1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r168746 | murf | 2009-01-15 17:34:31 -0700 (Thu, 15 Jan 2009) | 20 lines Merged revisions 168745 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168745 | murf | 2009-01-15 17:19:12 -0700 (Thu, 15 Jan 2009) | 14 lines This patch fixes a problem where a goto (or jump, in this case) fails a consistency check because it can't find a matching extension. The problem was a missing instruction to end the range notation in the code where it converts the pattern into a regex and uses the regex code to determine the match. I tested using the AEL code the user supplied, and now, the consistency check passes. (closes issue #14141) Reported by: dimas ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168748 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-15Merged revisions 168737 via svnmerge from murf3-130/+147
https://origsvn.digium.com/svn/asterisk/trunk ........ r168737 | murf | 2009-01-15 13:54:59 -0700 (Thu, 15 Jan 2009) | 16 lines This patch allows null args in ast_expr2 func calls, and fixes commas being converted to pipes, which was 1.4 type stuff. If the user says count=ENUMLOOKUP(${EXTEN},ALL,c,,enum.mydomain.tld); then it won't complain about the empty arg (c,,...) and fabled's patch won't let it swap the commas for pipes. Ran it thru my dialplan and no complaints. (closes issue #14169) Reported by: fabled Patches: function-argument-separator-fix.diff uploaded by fabled (license 448) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168739 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-15Blocked revisions 168734 via svnmergekpfleming0-0/+0
........ r168734 | kpfleming | 2009-01-15 14:18:53 -0600 (Thu, 15 Jan 2009) | 5 lines remove the PBX_ODBC logic from the configure script, and add GENERIC_ODCB logic that includes copying the relevant LIB and INCLUDE data from either UnixODBC or iODBC, based on which was found; if both were found, prefer UnixODBC this stops modules from being linked against both sets of libraries on systems that have both installed ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168735 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-15Blocked revisions 168732 via svnmergemmichelson0-0/+0
........ r168732 | mmichelson | 2009-01-15 14:00:46 -0600 (Thu, 15 Jan 2009) | 3 lines Add missing brace ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168733 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-15Merged revisions 168728 via svnmerge from mmichelson1-2/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r168728 | mmichelson | 2009-01-15 13:16:29 -0600 (Thu, 15 Jan 2009) | 3 lines Fix the compactheaders option in sip.conf ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168729 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-15Merged revisions 168722 via svnmerge from oej1-0/+1
https://origsvn.digium.com/svn/asterisk/trunk ................ r168722 | oej | 2009-01-15 19:47:14 +0100 (Tor, 15 Jan 2009) | 10 lines Merged revisions 168721 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168721 | oej | 2009-01-15 19:43:43 +0100 (Tor, 15 Jan 2009) | 2 lines Meetme actually has realtime but wasn't documented ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@168727 f38db490-d61c-443f-a65b-d21fe96a405b