aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2010-10-12Add documention that mentions options are defined but not used.lmadsen1-2/+2
(Issue #18101) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@291229 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-11Make exit from handle_request_do() consistent.rmudgett1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@291111 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-11Merged revisions 291109 via svnmerge from rmudgett1-3/+8
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r291109 | rmudgett | 2010-10-11 13:29:43 -0500 (Mon, 11 Oct 2010) | 1 line Add missing unlock to an exception condition in reload_config(). ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@291110 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-11Fixed infinite loop in verbose/debug message output.rmudgett1-17/+38
Setting the module/filename specific message level and then changing it resulted in the linked list being looped on itself. Traversing this linked list is an infinite loop if what you are looking for is not in the list. Also plugged some CLI parsing holes in the associated CLI command: * Removing a nonexistent module from the list actually added it with a level of zero. * Setting the non-module specific level to zero is now equivalent to setting it to "off" as documented. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@291073 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-08Merged revisions 290862 via svnmerge from jpeeler1-4/+5
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r290862 | jpeeler | 2010-10-07 21:35:29 -0500 (Thu, 07 Oct 2010) | 9 lines Ensure editline cleanup occurs when Ctrl-C is pressed at control console. A recent change was made to avoid a race condition on shutdown which only called the end functions from the console thread. However, when pressing Ctrl-C the quit handler is called from the signal handler thread. (closes issue #17698) Reported by: jmls ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@290863 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-07Merged revisions 290750 via svnmerge from qwell3-26986/+6861
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r290750 | qwell | 2010-10-07 15:56:04 -0500 (Thu, 07 Oct 2010) | 9 lines Allow PRI to build properly when using --with-pri. Use the directories found for the parent when using lib dependencies. (closes issue #17314) Reported by: tzafrir Patches: 17314-withdeps.diff uploaded by qwell (license 4) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@290751 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-07Don't crash when Set() is called without a value.russell1-2/+9
Review: https://reviewboard.asterisk.org/r/949/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@290712 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-06Allow streaming audio from a pipe.tilghman1-3/+5
(closes issue #18001) Reported by: jamicque Patches: 20100926__issue18001.diff.txt uploaded by tilghman (license 14) Tested by: jamicque git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@290575 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-05Merged revisions 290392 via svnmerge from tilghman1-3/+6
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r290392 | tilghman | 2010-10-05 15:20:07 -0500 (Tue, 05 Oct 2010) | 8 lines Fix a crash by ensuring that we don't alter memory after it's freed. (closes issue #17387) Reported by: jmls Patches: 20100726__issue17387.diff.txt uploaded by tilghman (license 14) Tested by: jmls ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@290396 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-05Fixes PickupChan() not working with full channel name.dvossel1-8/+16
(closes issue #18011) Reported by: schern Patches: app_directed_pickup.c.2.patch uploaded by schern (license 995) app_directed_pickup.c.trunk.patch uploaded by schern (license 995) Tested by: schern, dvossel git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@290375 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-05Merged revisions 290323 via svnmerge from rmudgett1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r290323 | rmudgett | 2010-10-05 12:41:18 -0500 (Tue, 05 Oct 2010) | 11 lines Merged revision 258974 from https://origsvn.digium.com/svn/asterisk/trunk .......... r258974 | diruggles | 2010-04-26 14:05:47 -0500 (Mon, 26 Apr 2010) | 4 lines Line 24 missed in compatibility fix in revision 233577 added a "fun:" prefix line 24 .......... ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@290324 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-04Change new pattern matcher to regard dashes the same as the old pattern ↵tilghman11-1846/+1929
matcher -- as visual candy to be ignored. Also change the AEL parser to not generate dashes within extensions, as those dashes would be ignored. Update the AEL tests to match this behavior. (closes issue #17366) Reported by: murf Patches: 20100727__issue17366.diff.txt uploaded by tilghman (license 14) Tested by: tilghman git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@290254 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-04Merged revisions 290177 via svnmerge from tilghman2-15/+15
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r290177 | tilghman | 2010-10-04 15:15:26 -0500 (Mon, 04 Oct 2010) | 2 lines Fixing Mac OS X auto-builder. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@290201 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-03Merged revisions 290100 via svnmerge from tilghman2-6/+166
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r290100 | tilghman | 2010-10-03 16:04:29 -0500 (Sun, 03 Oct 2010) | 2 lines Automatically re-run configure test for menuselect, when the relevant makeopts settings change. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@290101 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-02Merged revisions 289949 via svnmerge from oej1-0/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289949 | oej | 2010-10-02 10:50:05 +0200 (Lör, 02 Okt 2010) | 2 lines Add documentation for undocumented option to AMI action originate ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289950 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-02Merged revisions 289873 via svnmerge from tilghman1-12/+6
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289873 | tilghman | 2010-10-01 23:42:08 -0500 (Fri, 01 Oct 2010) | 8 lines When forwarding a message, a prepend means that the filesystem will always have a better copy. (closes issue #17803) Reported by: dpetersen Patches: 20100923__issue17803.diff.txt uploaded by tilghman (license 14) Tested by: dpetersen ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289874 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-01Merged revisions 289797 via svnmerge from jpeeler3-2/+15
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289797 | jpeeler | 2010-10-01 17:58:38 -0500 (Fri, 01 Oct 2010) | 15 lines Change RFC2833 DTMF event duration on end to report actual elapsed time. The scenario here is with a non P2P early media session. The reported time length of DTMF presses are coming up short when sending to the remote side. Currently the event duration is a running total that is incremented when sending continuation packets. These continuation packets are only triggered upon incoming media from the remote side, which means that the running total probably is not going to end up matching the actual length of time Asterisk received DTMF. This patch changes the end event duration to be lengthened if it is detected that the end event is going to come up short. Review: https://reviewboard.asterisk.org/r/957/ ABE-2476 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289798 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-01Merged revisions 289703 via svnmerge from pabelanger2-22/+18
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289703 | pabelanger | 2010-10-01 13:03:11 -0400 (Fri, 01 Oct 2010) | 6 lines Disable debugging by default and reformat .config file. Review: https://reviewboard.asterisk.org/r/929/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289704 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-01Merged revisions 289699 via svnmerge from jpeeler1-3/+8
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289699 | jpeeler | 2010-10-01 11:20:00 -0500 (Fri, 01 Oct 2010) | 14 lines Ensure user portion of SIP URI matches dialplan when using encoded characters. This commit takes a simliar approach to 288112 and checks the dialplan to determine the proper action for an incoming contact header as to whether or not it should be decoded or not. sip_new was blindly always decoding the extension, which also caused the outgoing contact header to be incorrect as well as failing to match the encoded extension in the dialplan. (closes issue #17892) Reported by: wdoekes Patches: bug17892-1.patch uploaded by jpeeler (license 325) Tested by: wdoekes ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289700 f38db490-d61c-443f-a65b-d21fe96a405b
2010-10-01don't iterate through all dialogs to find and delete old subscribesschmitds1-35/+5
On every incoming subscribe there is a iteration through all dialogs to find old subscribes and delete them. This is slow and not RFC conform. This was only needed in 1.2 cause a subscribe was not deleted when a dialog was destroyed, after 1.4 a subscribe get removed when its dialog is destroyed. (closes issue #17950) Reported by: schmidts Tested by: schmidts Review: https://reviewboard.asterisk.org/r/901/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289622 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-30Properly handle channel allocation failures duing invites with replaces.mnicholson1-2/+3
ABE-2588 git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289553 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-30Merged revisions 289500 via svnmerge from bbryant1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289500 | bbryant | 2010-09-30 13:08:20 -0400 (Thu, 30 Sep 2010) | 11 lines res_agi.c:handle_getvariablefull() could recursively lock a channel and not release it if an argument is the current channel's name. (closes issue #17970) Reported by: mdu113 Patches: res_agi.c.diff3 uploaded by mdu113 (license 582) Tested by: mdu113 Review: https://reviewboard.asterisk.org/r/947/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289501 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-30Merged revisions 289424 via svnmerge from russell1-0/+6
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289424 | russell | 2010-09-30 10:34:29 -0500 (Thu, 30 Sep 2010) | 8 lines Fix a crash in app_sms. Since the data being passed to the generator callback is on the stack of the SMS() application, we must ensure that the generator is stopped before the application exits. ABE-2587 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289425 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-29Merged revisions 289338 via svnmerge from qwell2-3/+8
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289338 | qwell | 2010-09-29 15:56:26 -0500 (Wed, 29 Sep 2010) | 8 lines Allow a manager originate to succeed on forwarded devices. The timeout to wait for an answer was being set to 0 when a device forwarded to another extension. We don't always need the timeout set like this, so make it an optional parameter, and don't use it in this case. ABE-2544 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289339 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-29Update sample documentation to note md5secret requirements.lmadsen1-3/+6
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289334 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-29Don't completely ignore md5secret from LDAP if the value does not begin with ↵russell1-4/+0
{md5}. This fixes a problem that lmadsen ran in to where md5secret was not working for him. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289332 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-29Merged revisions 289177 via svnmerge from mnicholson1-0/+3
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289177 | mnicholson | 2010-09-29 10:03:27 -0500 (Wed, 29 Sep 2010) | 8 lines Set the caller id on CDRs when it is set on the parent channel. (closes issue #17569) Reported by: tbelder Patches: 17569.diff uploaded by tbelder (license 618) Tested by: tbelder ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289178 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-28Merged revisions 289094 via svnmerge from bbryant1-3/+7
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289094 | bbryant | 2010-09-28 14:10:19 -0400 (Tue, 28 Sep 2010) | 14 lines Fixes an issue with the Newchannel AMI event during the Masquerading process. Fixes an issue with the Newchannel AMI event during the Masquerading process, where no Newchannel AMI event was generated for the psuedo channel used during the masquerading process. (closes issue #17987) Reported by: RadicAlish Patches: newchannel.patch.txt uploaded by RadicAlish (license 1122) Tested by: RadicAlish Review: https://reviewboard.asterisk.org/r/937/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289095 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-24Merged revisions 288746 via svnmerge from twilson1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r288746 | twilson | 2010-09-24 08:26:09 -0700 (Fri, 24 Sep 2010) | 5 lines Don't fail a masquerade if it is already being hung up This avoids noise on some Local channel situations where we don't use /n. Thanks to Alec Davis for the suggestion. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288747 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-24Solaris won't printf a NULL.tilghman1-2/+2
(closes issue #18041) Reported by: asgaroth git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288712 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-24Merged revisions 288636 via svnmerge from tilghman7-14/+101
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r288636 | tilghman | 2010-09-23 22:20:24 -0500 (Thu, 23 Sep 2010) | 2 lines Solaris compatibility fixes ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288637 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288499 via svnmerge from twilson1-0/+9
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r288499 | twilson | 2010-09-22 16:00:30 -0700 (Wed, 22 Sep 2010) | 8 lines Don't let a Local channel get bridged to itself If a local channel gets bridged to itself, it becomes orphaned with no devices left to actually tell it to hang up. This patch modifies local_fixup() to detect this case and deny it. Review: https://reviewboard.asterisk.org/r/934 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288500 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288416 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r288416 | dvossel | 2010-09-22 12:48:15 -0500 (Wed, 22 Sep 2010) | 5 lines RFC3261 section 12.2 explicitly says out of order requests are responded with a 500 Server Internal Error response. ABE-2458 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288417 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Blocked revisions 288412 via svnmergemnicholson0-0/+0
........ r288412 | mnicholson | 2010-09-22 12:39:12 -0500 (Wed, 22 Sep 2010) | 6 lines Handle media specific T.38 SDP information (closes issue #16647) Reported by: kwemheuer ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288414 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288343 via svnmerge from dvossel1-2/+3
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r288343 | dvossel | 2010-09-22 11:49:56 -0500 (Wed, 22 Sep 2010) | 2 lines During check_pendings, if the dialog is terminated with a CANCEL, change the invitestate to INV_CANCEL like in sip_hangup. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288344 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288339 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r288339 | russell | 2010-09-22 11:39:16 -0500 (Wed, 22 Sep 2010) | 11 lines Fix a 100% CPU consumption problem when setting console=yes in asterisk.conf. The handling of -c and console=yes should be the same, but they were not. When you specify -c, it sets both a flag for console module and for asterisk not to fork() off into the background. The handling of console=yes only set console mode, so you would end up with a background process() trying to run the Asterisk console and freaking out since it didn't have anything to read input from. Thanks to beagles for reporting and helping debug the problem! ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288340 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288265-288266 via svnmerge from tilghman3-1/+26
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r288265 | tilghman | 2010-09-22 09:48:04 -0500 (Wed, 22 Sep 2010) | 9 lines Allow the encoding to be set, in case local charset does not agree with database. (closes issue #16940) Reported by: jamicque Patches: 20100827__issue16940.diff.txt uploaded by tilghman (license 14) 20100921__issue16940__1.6.2.diff.txt uploaded by tilghman (license 14) Tested by: jamicque ........ r288266 | tilghman | 2010-09-22 10:04:52 -0500 (Wed, 22 Sep 2010) | 5 lines Document addition of encoding parameter. (issue #16940) Reported by: jamicque ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288267 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288192 via svnmerge from rmudgett1-144/+165
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r288192 | rmudgett | 2010-09-21 18:55:58 -0500 (Tue, 21 Sep 2010) | 26 lines In chan_iax2.c:schedule_delivery() calls ast_bridged_channel() on an unlocked channel. Near the beginning of schedule_delivery(), ast_bridged_channel() is called on iaxs[fr->callno]->owner. However, the channel is not locked, which can result in ast_bridged_channel() crashing should owner->tech change to a technology that doesn't implement bridged_channel. I also fixed the other calls to ast_bridged_channel() in chan_iax2.c since the owner lock was not held there either. Converted the existing channel deadlock avoidance to use iax2_lock_owner(). Using the new function simplified some awkward code. In the process of fixing the locking on ast_bridged_channel(), I also found a memory leak in socket_process() for v1.6.2 and v1.8. The local struct variable ies.vars is not freed on early/abnormal function exits. (closes issue #17919) Reported by: rain Patches: issue17919_v1.4.patch uploaded by rmudgett (license 664) issue17919_w_leak_v1.6.2.patch uploaded by rmudgett (license 664) issue17919_w_leak_v1.8.patch uploaded by rmudgett (license 664) Review: https://reviewboard.asterisk.org/r/926/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288193 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Setup timer before set_config().pabelanger1-4/+4
(closes issue #18019) Reported by: Netview Patches: issue_0018019.patch uploaded by pabelanger (license 224) Tested by: Netview git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288147 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Blocked revisions 288116 via svnmergetilghman0-0/+0
........ r288116 | tilghman | 2010-09-21 17:17:33 -0500 (Tue, 21 Sep 2010) | 2 lines Underquoted definition of stringfield macro. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288125 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Merged revisions 288112 via svnmerge from tilghman1-9/+22
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r288112 | tilghman | 2010-09-21 16:58:13 -0500 (Tue, 21 Sep 2010) | 15 lines Try both the encoded and unencoded subscription URI for a match in hints. When a phone sends an encoded URI for a subscription, the URI is not matched with the actual hint that is in decoded format. For example, if we have an extension with a hint that is named: "#5601" or "*5601", the subscription will work fine if the phone subscribes with an already decoded URI, but when it's decoded like "%255601" or "%2A5601", Asterisk is unable to match it with the correct hint. (closes issue #17785) Reported by: ramonpeek Patches: 20100831__issue17785.diff.txt uploaded by tilghman (license 14) Tested by: ramonpeek ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288113 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Merged revisions 288005 via svnmerge from bbryant1-1/+3
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r288005 | bbryant | 2010-09-21 15:43:46 -0400 (Tue, 21 Sep 2010) | 8 lines Add a check to fix a rare segmentation fault you'd get if ast_frdup couldn't allocate memory on the first frame being queued in ast_queue_frame. (closes issue #17882) Reported by: seanbright Tested by: seanbright ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@288006 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Merged revisions 287933 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r287933 | tilghman | 2010-09-21 14:07:07 -0500 (Tue, 21 Sep 2010) | 2 lines Less than zero is an error, not any non-zero value. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@287934 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-20Merged revisions 287758 via svnmerge from bbryant1-6/+12
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r287758 | bbryant | 2010-09-20 19:57:08 -0400 (Mon, 20 Sep 2010) | 16 lines Fix misvalidation of meetme pins in conjunction with the 'a' MeetMe flag. When using the 'a' MeetMe flag and having a user and admin pin setup for your conference, using the user pin would gain you admin priviledges. Also, when no user pin was set, an admin pin was, the 'a' MeetMe flag wasn't used, and the user tried to enter a conference then they were still prompted for a pin and forced to hit #. (closes issue #17908) Reported by: kuj Patches: pins_2.patch uploaded by kuj (license 1111) Tested by: kuj Review: [full review board URL with trailing slash] ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@287759 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-20ast_channel_masquerade: Avoid recursive masquerades.alecdavis1-7/+15
Check all 4 combinations of (original/clonechan) * (masq/masqr). Initially original->masq and clonechan->masqr were only checked. It's possible with multiple masq's planned - and not yet executed, that the 'original' chan could already have another masq'd into it - thus original->masqr would be set, that masqr would lost. Likewise for the clonechan->masq. (closes issue #16057;#17363) Reported by: amorsen;davidw,alecdavis Patches: based on bug16057.diff4.txt uploaded by alecdavis (license 585) Tested by: ramonpeek, davidw, alecdavis git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@287685 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-20Don't crash when parking a non-bridged call.qwell1-10/+18
(closes issue #17680) Reported by: jmhunter Patches: chan_skinny-park-v1.txt uploaded by DEA (license 3) Tested by: jmhunter, DEA git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@287642 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-20Use ast_str when processing hint state changesmnicholson1-6/+10
Merged revisions 287555 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r287555 | mnicholson | 2010-09-20 10:48:14 -0500 (Mon, 20 Sep 2010) | 5 lines Use ast_dynamic_str when processing hint state changes (related to issue #17928) Reported by: mdu113 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@287558 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-20Revert r287556.mnicholson0-0/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@287557 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-20Use ast_str when processing hint state changesmnicholson0-0/+0
Merged revisions 287555 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r287555 | mnicholson | 2010-09-20 10:48:14 -0500 (Mon, 20 Sep 2010) | 5 lines Use ast_dynamic_str when processing hint state changes (related to issue #17928) Reported by: mdu113 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@287556 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-19Merged revisions 287469 via svnmerge from oej1-1/+7
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r287469 | oej | 2010-09-19 17:56:50 +0200 (Sön, 19 Sep 2010) | 7 lines Make sure we always free variables properly in manager originate. (closes issue #17891) reported, solved and tested by oej Review: https://reviewboard.asterisk.org/r/869/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@287470 f38db490-d61c-443f-a65b-d21fe96a405b