David Vossel e30d2c1d45 Locking issue in action_bridge and bridge_exec ...

action_bridge() and bridge_exec() both search for the channels to bridge to, and then immediately drop the lock.  Instead, they should hold the lock until the masquerade is complete.  This will guarantee the channel remains and prevent any other weirdness from occurring.  In action_bridge() some more weirdness comes into play.  Both channels are needlessly locked at the same time and perform the exact same logic.  It makes sense from a coding organizational standpoint, but could cause a theoretical deadlock so I split the code up.  There is an issue associated with this, but since its a rather complicated thing to reproduce I'm not certain this alone will close it.

issue# 14296
Review: http://reviewboard.digium.com/r/167/




git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177226 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2009-02-18 22:51:38 +00:00

..

db1-ast

Merged revisions 157859 via svnmerge from

2008-11-20 00:08:12 +00:00

editline

Merged revisions 163761 via svnmerge from

2008-12-12 22:04:26 +00:00

stdtime

Merged revisions 157859 via svnmerge from

2008-11-20 00:08:12 +00:00

abstract_jb.c

Create logfile safely.

2009-01-22 21:25:46 +00:00

acl.c

Another big chunk of changes from the RSW branch. Bunch of stuff from main/

2008-08-10 19:35:50 +00:00

adsistub.c

…

aescrypt.c

…

aeskey.c

…

aesopt.h

…

aestab.c

…

alaw.c

…

app.c

Merge a large set of updates to the Asterisk indications API.

2009-02-17 20:41:24 +00:00

ast_expr2.c

This patch allows null args in ast_expr2 func calls, and fixes commas being converted to pipes, which was 1.4 type stuff.

2009-01-15 20:54:59 +00:00

ast_expr2.fl

Merged revisions 144924-144925 via svnmerge from

2008-09-27 15:52:56 +00:00

ast_expr2.h

This patch allows null args in ast_expr2 func calls, and fixes commas being converted to pipes, which was 1.4 type stuff.

2009-01-15 20:54:59 +00:00

ast_expr2.y

This patch allows null args in ast_expr2 func calls, and fixes commas being converted to pipes, which was 1.4 type stuff.

2009-01-15 20:54:59 +00:00

ast_expr2f.c

bring over all the fixes for the warnings found by gcc 4.3.x from the 1.4 branch, and add the ones needed for all the new code here too

2008-11-02 18:52:13 +00:00

asterisk.c

Merge a large set of updates to the Asterisk indications API.

2009-02-17 20:41:24 +00:00

astmm.c

Janitor, use ARRAY_LEN() when possible.

2008-12-05 10:31:25 +00:00

astobj2.c

Make lock information for ao2_trylock be more useful and gnarly

2009-02-12 16:28:06 +00:00

audiohook.c

Always detach and destroy the whisper and barge audiohooks. Additionally also allow an audiohook to be detached if it has not been attached.

2009-02-06 15:59:17 +00:00

autoservice.c

Merged revisions 163448 via svnmerge from

2008-12-12 13:55:30 +00:00

buildinfo.c

fix a few small things found by using sparse

2008-10-30 16:49:02 +00:00

callerid.c

Merged revisions 160943 via svnmerge from

2008-12-04 16:45:06 +00:00

cdr.c

Merge ast_str_opaque branch (discontinue usage of ast_str internals)

2008-12-13 08:36:35 +00:00

channel.c

Merged revisions 176701 via svnmerge from

2009-02-17 22:08:00 +00:00

chanvars.c

Add additional memory debugging to several core APIs, and fix several memory

2008-10-14 22:38:06 +00:00

cli.c

Remove tabs from comment

2009-01-29 23:15:20 +00:00

config.c

If there are no realtime engines, there's no reason to check for realtime families

2009-02-17 15:18:55 +00:00

cryptostub.c

Don't include logger.h in asterisk.h by default as it is causing problems building

2008-10-10 00:42:13 +00:00

cygload.c

…

datastore.c

make datastore creation and destruction a generic API since it is not really channel related, and add the ability to add/find/remove datastores to manager sessions

2008-08-05 16:56:11 +00:00

db.c

Merged revisions 167299 via svnmerge from

2009-01-06 21:36:44 +00:00

devicestate.c

Slightly optimize ast_devstate_str and rename global functions devstate2str and config_text_file_save to have an ast_ prefix

2008-11-04 18:47:20 +00:00

dial.c

* Fixed timeout logic in the dialing API as setting timeouts

2008-10-31 20:05:46 +00:00

dns.c

incorporates r159808 from branches/1.4:

2008-11-29 17:57:39 +00:00

dnsmgr.c

Record the previous port in the temporary address structure so that the comparison does not treat the host as having changed even if it did not. This would have been uninitialized before and would have led to a baddddd port.

2008-12-22 16:08:13 +00:00

dsp.c

Add an option, waitfordialtone, for UK analog lines which do not end a call

2008-11-25 22:45:59 +00:00

ecdisa.h

…

enum.c

Create a new config file status, CONFIG_STATUS_FILEINVALID for differentiating

2008-09-12 23:30:03 +00:00

event.c

incorporates r159808 from branches/1.4:

2008-11-29 17:57:39 +00:00

features.c

Locking issue in action_bridge and bridge_exec

2009-02-18 22:51:38 +00:00

file.c

Fix a problem where file playback would cause fds to remain open forever

2009-02-04 15:30:12 +00:00

fixedjitterbuf.c

…

fixedjitterbuf.h

Merged revisions 135841,135847,135850 via svnmerge from

2008-08-06 00:30:53 +00:00

frame.c

Add basic (passthrough, playback, record) support for ITU G.722.1 and G.722.1C (also known as Siren7 and Siren14)

2009-02-13 13:35:24 +00:00

fskmodem_float.c

Optionally build integer-based routines for FSK tone decoding (but default

2008-07-21 20:59:03 +00:00

fskmodem_int.c

Optionally build integer-based routines for FSK tone decoding (but default

2008-07-21 20:59:03 +00:00

fskmodem.c

(Step 2 of 2)

2008-07-21 21:00:47 +00:00

global_datastores.c

Merged revisions 172517 via svnmerge from

2009-01-30 21:29:12 +00:00

hashtab.c

Add additional memory debugging to several core APIs, and fix several memory

2008-10-14 22:38:06 +00:00

heap.c

Add an implementation of the heap data structure.

2009-02-17 20:51:10 +00:00

http.c

Fix qualify for TCP peer

2009-01-17 01:56:36 +00:00

image.c

…

indications.c

Merge a large set of updates to the Asterisk indications API.

2009-02-17 20:41:24 +00:00

io.c

…

jitterbuf.c

Merged revisions 174583 via svnmerge from

2009-02-10 18:16:31 +00:00

loader.c

Merge a large set of updates to the Asterisk indications API.

2009-02-17 20:41:24 +00:00

logger.c

Assist proper thread synchronization when stopping the logger thread.

2009-02-16 18:25:57 +00:00

Makefile

Add an implementation of the heap data structure.

2009-02-17 20:51:10 +00:00

manager.c

Fix an fd leak that would occur in HTTP AMI sessions

2009-02-10 21:45:14 +00:00

md5.c

…

netsock.c

Make OpenBSD compile again

2008-06-19 20:25:37 +00:00

pbx.c

This patch fixes merge_contexts_and_delete so it does not deadlock when hints are present.

2009-02-18 15:35:26 +00:00

plc.c

…

poll.c

Merged revisions 140816 via svnmerge from

2008-09-03 13:26:43 +00:00

privacy.c

…

rtp.c

suppress smoothers for Siren codecs as well as Speex and G.723.1

2009-02-18 02:02:54 +00:00

say.c

Fix a crash when saying certain numbers in Chinese

2009-01-21 22:10:02 +00:00

sched.c

Significantly improve scheduler performance under high load.

2009-02-17 21:04:08 +00:00

sha1.c

…

slinfactory.c

improve slinfactory API to remove implicit sample rate and require explicit sample rate selection by creator of the slinfactory

2009-02-10 19:38:26 +00:00

srv.c

bump the verbosity of a message in srv.c up by one. It used to be

2009-01-12 23:12:30 +00:00

strcompat.c

…

strings.c

Might want to update the buffer pointer after a realloc (or we crash)

2009-02-16 23:48:54 +00:00

taskprocessor.c

correct a CLI description

2009-01-13 16:02:13 +00:00

tcptls.c

When using a socket as a FILE *, the stdio functions will sometimes try to do

2009-02-04 18:48:06 +00:00

tdd.c

Don't include logger.h in asterisk.h by default as it is causing problems building

2008-10-10 00:42:13 +00:00

term.c

Merge changes from team/group/appdocsxml

2008-11-01 21:10:07 +00:00

threadstorage.c

Merged revisions 164736 via svnmerge from

2008-12-16 17:14:01 +00:00

timing.c

Update the timing API to have better support for multiple timing interfaces.

2009-02-17 21:22:40 +00:00

translate.c

Merge ast_str_opaque branch (discontinue usage of ast_str internals)

2008-12-13 08:36:35 +00:00

udptl.c

Merged revisions 175311 via svnmerge from

2009-02-12 21:25:14 +00:00

ulaw.c

…

utils.c

Fixed error where a check for an zero length, terminated string was needed.

2009-02-18 17:24:07 +00:00

xml.c

1. Make OS X compile cleanly with app_stack.

2009-02-03 00:29:49 +00:00

xmldoc.c

Don't forget to free typename

2008-12-31 22:53:55 +00:00