Richard Mudgett 0a8f9d2cf0 Merged revisions 322749 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r322749 | rmudgett | 2011-06-09 11:31:53 -0500 (Thu, 09 Jun 2011) | 15 lines
  
  Remove potential deadlock in call pickup race.
  
  Deadlock is possible in ast_do_pickup() when holding the target channel
  lock and trying to get the chan channel lock.  Also, holding the target
  lock when calling ast_channel_masquerade() is not a good idea because that
  routine does deadlock avoidance.
  
  * Removed the need to hold the target lock after marking the target with a
  datastore and getting the connected line data off of the target channel.
  
  * Moved can_pickup() to ast_can_pickup() in features.c.  Now all the call
  pickup methods use the same basic call pickup availability check.
  
  Review: https://reviewboard.asterisk.org/r/1234/
........


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

2011-06-09 16:47:07 +00:00

..

db1-ast

…

editline

Add gar to the check for AR for those silly OSes (Solaris) that don't have ar.

2010-04-27 21:13:01 +00:00

stdtime

Merged revisions 291791 via svnmerge from

2010-10-14 18:46:54 +00:00

abstract_jb.c

Introduction of the JITTERBUFFER dialplan function.

2011-04-20 20:52:15 +00:00

acl.c

Merged revisions 304638 via svnmerge from

2011-01-28 20:19:57 +00:00

alaw.c

…

aoc.c

Typos: recieved => received

2010-12-20 09:14:45 +00:00

app.c

Increase prepend filename length.

2011-05-09 14:41:33 +00:00

ast_expr2.c

Merged revisions 293197 via svnmerge from

2010-10-28 20:01:28 +00:00

ast_expr2.fl

Merged revisions 309808 via svnmerge from

2011-03-07 01:01:08 +00:00

ast_expr2.h

Merged revisions 293197 via svnmerge from

2010-10-28 20:01:28 +00:00

ast_expr2.y

Merged revisions 293197 via svnmerge from

2010-10-28 20:01:28 +00:00

ast_expr2f.c

Merged revisions 309808 via svnmerge from

2011-03-07 01:01:08 +00:00

asterisk.c

Merged revisions 322069 via svnmerge from

2011-06-06 19:15:10 +00:00

asterisk.dynamics

Remove the old stub files, preferring the optional_api method.

2010-07-14 20:48:59 +00:00

asterisk.exports.in

Merged revisions 288640 via svnmerge from

2010-09-24 03:43:14 +00:00

astfd.c

Merged revisions 228338 via svnmerge from

2009-11-06 15:42:46 +00:00

astmm.c

…

astobj2.c

Fix some astobj2 iterator breakage, add another unit test.

2011-06-03 18:25:11 +00:00

audiohook.c

Merged revisions 316265 via svnmerge from

2011-05-03 20:45:32 +00:00

autochan.c

…

autoservice.c

Merged revisions 278167 via svnmerge from

2010-07-20 22:26:23 +00:00

bridging.c

New HD ConfBridge conferencing application.

2011-04-21 18:11:40 +00:00

buildinfo.c

…

callerid.c

Merged revisions 310636 via svnmerge from

2011-03-14 16:55:30 +00:00

ccss.c

Merged revisions 321924 via svnmerge from

2011-06-03 21:49:58 +00:00

cdr.c

Merged revisions 321547 via svnmerge from

2011-06-01 23:12:25 +00:00

cel.c

Merged revisions 283230 via svnmerge from

2010-08-23 13:23:37 +00:00

channel.c

Support routing text messages outside of a call.

2011-06-01 21:31:40 +00:00

chanvars.c

…

cli.c

Merged revisions 313860 via svnmerge from

2011-04-15 15:20:46 +00:00

config.c

Merged revisions 316265 via svnmerge from

2011-05-03 20:45:32 +00:00

cygload.c

…

data.c

Media Project Phase2: SILK 8khz-24khz, SLINEAR 8khz-192khz, SPEEX 32khz, hd audio ConfBridge, and other stuff

2011-02-22 23:04:49 +00:00

datastore.c

Merged revisions 273565 via svnmerge from

2010-07-01 22:16:23 +00:00

db.c

Merged revisions 286112 via svnmerge from

2010-09-13 22:13:27 +00:00

devicestate.c

Merged revisions 294501 via svnmerge from

2010-11-10 12:52:46 +00:00

dial.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

dns.c

…

dnsmgr.c

Merged revisions 322425 via svnmerge from

2011-06-08 18:48:16 +00:00

dsp.c

Merged revisions 319261 via svnmerge from

2011-05-16 21:08:50 +00:00

ecdisa.h

…

enum.c

Extend max call limit duration from 24.8 days to 292+ million years.

2010-01-18 22:31:25 +00:00

event.c

Merged revisions 321871 via svnmerge from

2011-06-03 21:02:32 +00:00

features.c

Merged revisions 322749 via svnmerge from

2011-06-09 16:47:07 +00:00

file.c

Merged revisions 316265 via svnmerge from

2011-05-03 20:45:32 +00:00

fixedjitterbuf.c

Fix various typos reported by Lintian

2010-07-02 15:57:02 +00:00

fixedjitterbuf.h

…

format_cap.c

Merged revisions 320796 via svnmerge from

2011-05-25 16:50:38 +00:00

format_pref.c

Media Project Phase2: SILK 8khz-24khz, SLINEAR 8khz-192khz, SPEEX 32khz, hd audio ConfBridge, and other stuff

2011-02-22 23:04:49 +00:00

format.c

Media Project Phase2: SILK 8khz-24khz, SLINEAR 8khz-192khz, SPEEX 32khz, hd audio ConfBridge, and other stuff

2011-02-22 23:04:49 +00:00

frame.c

Media Project Phase2: SILK 8khz-24khz, SLINEAR 8khz-192khz, SPEEX 32khz, hd audio ConfBridge, and other stuff

2011-02-22 23:04:49 +00:00

framehook.c

Merged revisions 287647 via svnmerge from

2010-09-20 22:16:37 +00:00

fskmodem_float.c

Merged revisions 316265 via svnmerge from

2011-05-03 20:45:32 +00:00

fskmodem_int.c

…

fskmodem.c

…

global_datastores.c

Add SRTP support for Asterisk

2010-06-08 05:29:08 +00:00

hashtab.c

…

heap.c

Merged revisions 304950 via svnmerge from

2011-01-31 06:50:49 +00:00

http.c

Merged revisions 316917-316919 via svnmerge from

2011-05-05 02:34:29 +00:00

image.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

indications.c

Asterisk media architecture conversion - no more format bitfields

2011-02-03 16:22:10 +00:00

io.c

…

jitterbuf.c

…

loader.c

clarify warning when no loadable module support

2011-02-09 19:17:01 +00:00

lock.c

Merged revisions 314358 via svnmerge from

2011-04-20 05:28:36 +00:00

logger.c

Merged revisions 307092 via svnmerge from

2011-02-08 21:24:57 +00:00

Makefile

Merged revisions 298960 via svnmerge from

2010-12-18 00:08:13 +00:00

manager.c

Merged revisions 320823 via svnmerge from

2011-05-25 17:14:11 +00:00

md5.c

…

message.c

Support routing text messages outside of a call.

2011-06-01 21:31:40 +00:00

netsock2.c

Merged revisions 321100 via svnmerge from

2011-05-26 20:16:28 +00:00

netsock.c

Merged revisions 298051 via svnmerge from

2010-12-10 16:28:14 +00:00

pbx.c

Merged revisions 317917 via svnmerge from

2011-05-06 21:07:49 +00:00

plc.c

Merged revisions 316265 via svnmerge from

2011-05-03 20:45:32 +00:00

poll.c

Merged revisions 285268 via svnmerge from

2010-09-07 19:09:08 +00:00

privacy.c

…

rtp_engine.c

Merged revisions 321042 via svnmerge from

2011-05-26 17:35:55 +00:00

say.c

Replace ast_log(LOG_DEBUG, ...) with ast_debug()

2011-02-04 16:55:39 +00:00

sched.c

Some scheduler API cleanup and improvements.

2010-12-20 17:15:54 +00:00

security_events.c

…

sha1.c

…

slinfactory.c

Media Project Phase2: SILK 8khz-24khz, SLINEAR 8khz-192khz, SPEEX 32khz, hd audio ConfBridge, and other stuff

2011-02-22 23:04:49 +00:00

srv.c

Merged revisions 321392 via svnmerge from

2011-05-27 23:46:07 +00:00

ssl.c

…

strcompat.c

Merged revisions 301263 via svnmerge from

2011-01-10 22:40:23 +00:00

strings.c

fixes segfault on logging

2010-05-18 22:48:51 +00:00

stun.c

Merged revisions 284597 via svnmerge from

2010-09-02 05:02:54 +00:00

syslog.c

…

taskprocessor.c

Replace ast_log(LOG_DEBUG, ...) with ast_debug()

2011-02-04 16:55:39 +00:00

tcptls.c

Merged revisions 320568 via svnmerge from

2011-05-23 16:28:14 +00:00

tdd.c

…

term.c

Merged revisions 269334 via svnmerge from

2010-06-09 17:32:52 +00:00

test.c

Kill some startup warnings and errors and make some messages more helpful in tracking down the source.

2010-07-09 17:00:22 +00:00

threadstorage.c

…

timing.c

Merged revisions 294278 via svnmerge from

2010-11-08 22:03:54 +00:00

translate.c

Fix compiler warning.

2011-02-23 23:55:58 +00:00

udptl.c

Merged revisions 316265 via svnmerge from

2011-05-03 20:45:32 +00:00

ulaw.c

…

utils.c

Use va_copy for stringfields

2011-05-26 15:55:22 +00:00

xml.c

Asterisk data retrieval API.

2010-04-22 18:07:02 +00:00

xmldoc.c

Replace ast_log(LOG_DEBUG, ...) with ast_debug()

2011-02-04 16:55:39 +00:00