You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Richard Mudgett 9172658d42 Merged revisions 318734 via svnmerge from ... https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r318734 | rmudgett | 2011-05-12 20:09:40 -0500 (Thu, 12 May 2011) | 43 lines Merged revisions 318671 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 * The applicable fixes for v1.4 are the SIP deadlock and the in progress masquerade check for multiple parties trying to pickup the same call. issue18654_v1.4.patch uploaded by rmudgett (license 664) * Backported to v1.6.2. issue18654_v1.6.2.patch uploaded by rmudgett (license 664) ........ r318671 | alecdavis | 2011-05-13 10:52:08 +1200 (Fri, 13 May 2011) | 30 lines Fix directed group pickup feature code *8 with pickupsounds enabled Since 1.6.2, the new pickupsound and pickupfailsound in features.conf cause many issues. 1). chan_sip:handle_request_invite() shouldn't be playing out the fail/success audio, as it has 'netlock' locked. 2). dialplan applications for directed_pickups shouldn't beep. 3). feature code for directed pickup should beep on success/failure if configured. Created a sip_pickup() thread to handle the pickup and playout the audio, spawned from handle_request_invite. Moved app_directed:pickup_do() to features:ast_do_pickup(). Functions below, all now use the new ast_do_pickup() app_directed_pickup.c: pickup_by_channel() pickup_by_exten() pickup_by_mark() pickup_by_part() features.c: ast_pickup_call() (closes issue #18654) Reported by: Docent Patches: ast_do_pickup_1.8_trunk.diff.txt uploaded by alecdavis (license 585) Tested by: lmadsen, francesco_r, amilcar, isis242, alecdavis, irroot, rymkus, loloski, rmudgett Review: https://reviewboard.asterisk.org/r/1185/ ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@318735 65c4cc65-6c06-0410-ace0-fbb531ad65f3		15 years ago
..
_private.h	Backport unit test API from trunk.	16 years ago
abstract_jb.h	Merged revisions 249893 via svnmerge from	17 years ago
acl.h	Merged revisions 254553 via svnmerge from	16 years ago
adsi.h	…
ael_structs.h	…
aes.h	Merged revisions 220586 via svnmerge from	17 years ago
aes_internal.h	…
agi.h	Remove optional_api from 1.6.2 branch, since it is not currently working.	17 years ago
alaw.h	…
app.h	Merged revisions 257560 via svnmerge from	16 years ago
ast_expr.h	…
ast_version.h	…
astdb.h	Merged revisions 302663 via svnmerge from	16 years ago
astmm.h	Fix malloc debug macros to work properly with h323.	18 years ago
astobj.h	…
astobj2.h	Follow coding guidelines in moh rescan fix. Also fix the documentation that got me in trouble.	16 years ago
astosp.h	…
audiohook.h	Merged revisions 279945 via svnmerge from	16 years ago
autoconfig.h.in	Merged revisions 313277 via svnmerge from	15 years ago
bridging.h	Merge phase 1 support for the new bridging architecture.	18 years ago
bridging_features.h	Merge phase 1 support for the new bridging architecture.	18 years ago
bridging_technology.h	Merge phase 1 support for the new bridging architecture.	18 years ago
buildinfo.h	…
callerid.h	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	18 years ago
causes.h	Merged revisions 262513 via svnmerge from	16 years ago
cdr.h	Merged revisions 235660 via svnmerge from	17 years ago
channel.h	Merged revisions 303546 via svnmerge from	16 years ago
chanvars.h	…
cli.h	Introduce CLI permissions.	18 years ago
compat.h	Merged revisions 288636 via svnmerge from	16 years ago
compiler.h	1. Make OS X compile cleanly with app_stack.	18 years ago
config.h	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	18 years ago
crypto.h	Merged revisions 186321 via svnmerge from	17 years ago
datastore.h	Merged revisions 192318 via svnmerge from	17 years ago
devicestate.h	Merged revisions 205412 via svnmerge from	17 years ago
dial.h	…
dlinkedlists.h	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	18 years ago
dns.h	…
dnsmgr.h	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	18 years ago
doxyref.h	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	18 years ago
dsp.h	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	18 years ago
dundi.h	incorporates r159808 from branches/1.4:	18 years ago
endian.h	…
enum.h	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	18 years ago
event.h	Fix cache of device state changes for multiple servers.	16 years ago
event_defs.h	…
extconf.h	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	18 years ago
features.h	Merged revisions 318734 via svnmerge from	15 years ago
file.h	Merged revisions 265090 via svnmerge from	16 years ago
frame.h	Merged revisions 296990 via svnmerge from	16 years ago
fskmodem.h	…
fskmodem_float.h	…
fskmodem_int.h	…
global_datastores.h	Merged revisions 172517 via svnmerge from	18 years ago
hashtab.h	Add MALLOC_DEBUG to various utility APIs, so that memory leaks can be tracked back to their source.	18 years ago
heap.h	Merged revisions 184512 via svnmerge from	17 years ago
http.h	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	18 years ago
image.h	…
indications.h	Fix build issues on Solaris and OpenBSD.	18 years ago
inline_api.h	…
io.h	Merged revisions 182847 via svnmerge from	18 years ago
jabber.h	Fix compiler warnings when using openssl-dev 1.0.0+	16 years ago
jingle.h	…
linkedlists.h	Merged revisions 226305 via svnmerge from	17 years ago
localtime.h	…
lock.h	Merged revisions 273830 via svnmerge from	16 years ago
logger.h	Merged revisions 298905 via svnmerge from	16 years ago
manager.h	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	18 years ago
md5.h	…
mod_format.h	…
module.h	Merged revisions 209098 via svnmerge from	17 years ago
monitor.h	Remove optional_api from 1.6.2 branch, since it is not currently working.	17 years ago
musiconhold.h	…
netsock.h	Merged revisions 222873 via svnmerge from	17 years ago
network.h	…
options.h	Merged revisions 265320,265467 via svnmerge from	16 years ago
paths.h	…
pbx.h	Merged revisions 286059 via svnmerge from	16 years ago
plc.h	…
poll-compat.h	Merged revisions 284478 via svnmerge from	16 years ago
privacy.h	…
pval.h	Merged revisions 271483 via svnmerge from	16 years ago
res_odbc.h	Merged revisions 185912 via svnmerge from	17 years ago
rtp.h	Merged revisions 289797 via svnmerge from	16 years ago
say.h	Fixed some doxygen comments	18 years ago
sched.h	Merged revisions 214650 via svnmerge from	17 years ago
select.h	Merged revisions 315501 via svnmerge from	15 years ago
sha1.h	…
slin.h	Merged revisions 267862,267877 via svnmerge from	16 years ago
slinfactory.h	improve slinfactory API to remove implicit sample rate and require explicit sample rate selection by creator of the slinfactory	18 years ago
smdi.h	Remove optional_api from 1.6.2 branch, since it is not currently working.	17 years ago
speech.h	…
srv.h	…
stringfields.h	Merged revisions 192357 via svnmerge from	17 years ago
strings.h	Merged revisions 271690 via svnmerge from	16 years ago
taskprocessor.h	Add Doxygen documentation for API changes from 1.6.0 to 1.6.1	18 years ago
tcptls.h	Merged revisions 225445 via svnmerge from	17 years ago
tdd.h	…
term.h	…
test.h	Merged revisions 275022 via svnmerge from	16 years ago
threadstorage.h	Merged revisions 236613 via svnmerge from	17 years ago
time.h	Merged revisions 205600 via svnmerge from	17 years ago
timing.h	Fix playback failure when using IAX with the timerfd module.	16 years ago
transcap.h	…
translate.h	Add fields back to ast_translator for ABI reasons.	16 years ago
udptl.h	Merged revisions 244443 via svnmerge from	17 years ago
ulaw.h	…
unaligned.h	…
utils.h	Merged revisions 298905 via svnmerge from	16 years ago
xml.h	…
xmldoc.h	…