aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2010-09-30Merged revisions 289425 via svnmerge from russell1-0/+6
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r289425 | russell | 2010-09-30 10:37:29 -0500 (Thu, 30 Sep 2010) | 15 lines Merged revisions 289424 via svnmerge from 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.8@289426 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-29Merged revisions 289339 via svnmerge from qwell2-3/+8
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r289339 | qwell | 2010-09-29 16:03:47 -0500 (Wed, 29 Sep 2010) | 15 lines Merged revisions 289338 via svnmerge from 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.8@289340 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-29Merged revisions 289334 via svnmerge from lmadsen1-3/+6
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r289334 | lmadsen | 2010-09-29 15:24:47 -0500 (Wed, 29 Sep 2010) | 1 line Update sample documentation to note md5secret requirements. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@289336 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-29Merged revisions 289332 via svnmerge from russell1-4/+0
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r289332 | russell | 2010-09-29 15:15:57 -0500 (Wed, 29 Sep 2010) | 4 lines Don't completely ignore md5secret from LDAP if the value does not begin with {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.8@289333 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-29Add 'ecm' to the sample fax config filemnicholson1-0/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@289300 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-29Update the CDR record when ast_channel_set_caller_event() is calledmnicholson1-0/+3
(related to issue #17569) Reported by: tbelder git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@289268 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-29Make development error message indicate which channel.rmudgett1-1/+3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@289253 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-29Merged revisions 289178 via svnmerge from mnicholson1-0/+3
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r289178 | mnicholson | 2010-09-29 10:04:11 -0500 (Wed, 29 Sep 2010) | 15 lines Merged revisions 289177 via svnmerge from 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.8@289179 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-28Solaris compatibility fixestilghman10-111/+296
Review: https://reviewboard.asterisk.org/r/942/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@289104 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-28Merged revisions 289095 via svnmerge from bbryant1-3/+7
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r289095 | bbryant | 2010-09-28 14:14:19 -0400 (Tue, 28 Sep 2010) | 21 lines Merged revisions 289094 via svnmerge from 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.8@289099 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-28Avoid deadlock processing incoming AOC-E messages.rmudgett1-7/+20
Deadlock avoidance for the owner channel was not done when processing incoming AOC-E messages. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@289057 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-28Revert stuff not ready for commit in -r289054.rmudgett1-246/+33
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@289055 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-28Break up long ast_manager_event_multichan() event lines.rmudgett2-36/+274
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@289054 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-27Still build SIP, even if res_crypto cannot be built (use, not depend).tilghman1-1/+1
(closes issue #18062) Reported by: a user on the mailing list git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288961 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-27Fix some documentation typos and spelling errors.russell1-4/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288927 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-27Fix a documentation spelling error.russell1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288925 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-24Append Retry-After header on 500 error response to Re-INVITE according to ↵dvossel1-2/+17
RFC3261 section 14.2. ABE-2301 git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288852 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-24Inspect Require header on BYE transaction according to RFC3261 section 8.2.2.3.dvossel1-2/+19
ABE-2293 git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288821 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-24Merged revisions 288747 via svnmerge from twilson1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r288747 | twilson | 2010-09-24 08:37:39 -0700 (Fri, 24 Sep 2010) | 12 lines Merged revisions 288746 via svnmerge from 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.8@288748 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-24Merged revisions 288712 via svnmerge from tilghman1-2/+2
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r288712 | tilghman | 2010-09-24 08:53:30 -0500 (Fri, 24 Sep 2010) | 5 lines Solaris won't printf a NULL. (closes issue #18041) Reported by: asgaroth ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288713 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-24Export timersub for platforms which do not have ittilghman1-0/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288640 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-24Merged revisions 288637 via svnmerge from tilghman7-14/+101
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r288637 | tilghman | 2010-09-23 22:36:01 -0500 (Thu, 23 Sep 2010) | 9 lines Merged revisions 288636 via svnmerge from 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.8@288638 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-23Add note about the checkhangup option of ${CHANNEL()}tilghman1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288606 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-23Make AMI honor enabled=notwilson1-2/+6
(closes issue #18040) Reported by: twilson Review: https://reviewboard.asterisk.org/r/938/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288572 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288500 via svnmerge from twilson1-0/+9
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r288500 | twilson | 2010-09-22 16:10:09 -0700 (Wed, 22 Sep 2010) | 15 lines Merged revisions 288499 via svnmerge from 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.8@288507 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288417 via svnmerge from dvossel1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r288417 | dvossel | 2010-09-22 12:49:05 -0500 (Wed, 22 Sep 2010) | 11 lines Merged revisions 288416 via svnmerge from 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.8@288418 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288344 via svnmerge from dvossel1-2/+3
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r288344 | dvossel | 2010-09-22 11:53:28 -0500 (Wed, 22 Sep 2010) | 9 lines Merged revisions 288343 via svnmerge from 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.8@288345 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288340 via svnmerge from russell1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r288340 | russell | 2010-09-22 11:44:13 -0500 (Wed, 22 Sep 2010) | 18 lines Merged revisions 288339 via svnmerge from 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.8@288341 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288267 via svnmerge from tilghman3-1/+26
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r288267 | tilghman | 2010-09-22 10:11:09 -0500 (Wed, 22 Sep 2010) | 23 lines Merged revisions 288265-288266 via svnmerge from 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.8@288268 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-22Merged revisions 288193 via svnmerge from rmudgett1-164/+170
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r288193 | rmudgett | 2010-09-21 19:03:37 -0500 (Tue, 21 Sep 2010) | 33 lines Merged revisions 288192 via svnmerge from 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.8@288194 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Merged revisions 288113 via svnmerge from tilghman1-9/+18
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r288113 | tilghman | 2010-09-21 16:59:46 -0500 (Tue, 21 Sep 2010) | 22 lines Merged revisions 288112 via svnmerge from 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.8@288159 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Merged revisions 288147 via svnmerge from pabelanger1-4/+4
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r288147 | pabelanger | 2010-09-21 18:22:43 -0400 (Tue, 21 Sep 2010) | 9 lines Setup timer before set_config(). (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.8@288157 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Add note in party manipulation chapter on interception macros.rmudgett1-0/+6
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288082 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Simplify locking code for REDIRECTING interception macro when forwarding a call.rmudgett2-17/+16
Simplified the locking code by using a local copy of the redirecting party information in app_dial.c:do_forward() and app_queue.c:wait_for_answer() for launching the REDIRECTING interception macro when a call is forwarded. Reduced the lock time of the 'o->chan' and 'in' channels. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288080 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Protect channel access in CONNECTED_LINE and REDIRECTING interception macro ↵rmudgett1-2/+8
launch code. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@288079 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Merged revisions 288006 via svnmerge from bbryant1-1/+3
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r288006 | bbryant | 2010-09-21 15:46:20 -0400 (Tue, 21 Sep 2010) | 14 lines Merged revisions 288005 via svnmerge from 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.8@288007 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Merged revisions 287934 via svnmerge from tilghman1-1/+1
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r287934 | tilghman | 2010-09-21 14:07:53 -0500 (Tue, 21 Sep 2010) | 9 lines Merged revisions 287933 via svnmerge from 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.8@287935 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Revert change in favor of a more targeted fixtwilson1-6/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287931 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Send a "415 Unsupported Media Type" after failure to process sdp due to ↵dvossel1-3/+17
unknown Content-Encoding header. ABE-2258 git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287929 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Cut-n-paste error in builtin_blindtransfer().rmudgett1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287897 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Don't use ast_strdupa() from within the arguments to a function.russell4-26/+50
(closes issue #17902) Reported by: afried Patches: issue_17902.rev1.txt uploaded by russell (license 2) Tested by: russell Review: https://reviewboard.asterisk.org/r/927/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287895 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Anonymous callerid needs a "sip:" uri prefix.tilghman1-2/+2
(closes issue #17981) Reported by: avalentin Patches: sip-anonymous-aastra.patch uploaded by avalentin (license 1107) (plus an additional fix by me) Tested by: avalentin git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287893 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Fix a regression in verbose logger processing.russell1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287863 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Don't generate connected line buffer twice for comparisontwilson1-29/+6
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287833 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-21Merged revisions 287759 via svnmerge from bbryant1-6/+12
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r287759 | bbryant | 2010-09-20 19:58:26 -0400 (Mon, 20 Sep 2010) | 23 lines Merged revisions 287758 via svnmerge from 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.8@287760 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-20Avoid infinite loop with certain local channel connected line updatestwilson1-0/+27
Compare connected line data before sending a connected line indication to avoid possible loops. Review: https://reviewboard.asterisk.org/r/932/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287757 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-20Merged revisions 287685 via svnmerge from alecdavis1-7/+15
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r287685 | alecdavis | 2010-09-21 11:16:45 +1200 (Tue, 21 Sep 2010) | 18 lines ast_channel_masquerade: Avoid recursive masquerades. 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.8@287701 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-20The inalarm flag was not set in sig_analog struct if the port is initially ↵rmudgett1-0/+5
in alarm. Fixed initial inalarm value for sig_analog ports. Along with -r261007, this gets the inalarm flag in sync with chan_dahdi for sig_analog ports. (closes issue #16983) git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287683 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-20ast_do_masquerade. Keep channels ao2_container locked while unlink and ↵alecdavis1-3/+2
linking channels. Previously, Masquerade would unlock 'original' and 'clonechan' and allow another masq thread to run. End result would be corrupted memory, and the frequent report 'Bad Magic Number'. (closes issue #17801,#17710) Reported by: notthematrix Patches: Based on bug17801.diff1.txt uploaded by alecdavis (license 585) Tested by: alecdavis Review: https://reviewboard.asterisk.org/r/928 git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287661 f38db490-d61c-443f-a65b-d21fe96a405b
2010-09-20Addition of the FrameHook API (AKA AwesomeHooks)dvossel6-5/+919
So far all our tools for viewing and manipulating media streams within Asterisk have been entirely focused on audio. That made sense then, but is not scalable now. The FrameHook API lets us tap into and manipulate _ANY_ type of media or signaling passed on a channel present today or in the future. This tool is a step in the direction of expanding Asterisk's boundaries and will help generate some rather interesting applications in the future. In addition to the FrameHook API, a simple dialplan function exercising the api has been included as well. This function is called FRAME_TRACE(). FRAME_TRACE() allows for the internal ast_frames read and written to a channel to be output. Filters can be placed on this function to debug only certain types of frames. This function could be thought of as an internal way of doing ast_frame packet captures. Review: https://reviewboard.asterisk.org/r/925/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287647 f38db490-d61c-443f-a65b-d21fe96a405b