kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
cabf08b511211902d1df13c3a16cdd5c18a68aad
asterisk/main
History
Richard Mudgett cabf08b511 Fix DTMF blind transfer continuing to execute dialplan after transfer. 
Party A calls Party B.
Party A DTMF blind transfers Party B to Party C.
Party A channel continues to execute dialplan.

* Fixed the return value of builtin_blindtransfer() to return the correct
value after a transfer so the dialplan will not keep executing.

* Removed unnecessary connected line update that did not really do
anything.

* Made access to GOTO_ON_BLINDXFR thread safe in check_goto_on_transfer().

* Fixed leak of xferchan for failure cases in check_goto_on_transfer().

* Updated debug messages in builtin_blindtransfer() and
check_goto_on_transfer().

(closes issue ASTERISK-18275)
Reported by: rmudgett
Tested by: rmudgett
........

Merged revisions 340809 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 340810 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-13 23:08:48 +00:00
..
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
Fix compile when certain G711 menuselect options are enabled.
2009-08-19 22:38:46 +00:00
aoc.c
Typos: recieved => received
2010-12-20 09:14:45 +00:00
app.c
Merged revisions 337120 via svnmerge from
2011-09-20 23:02:25 +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
do parse defaultlanguage from asterisk.conf
2011-09-13 21:40:56 +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
Two more minor fixes due to constification
2009-05-22 16:53:41 +00:00
astobj2.c
Fixed compiler warning and a couple prototype mismatches.
2011-07-31 00:19:11 +00:00
audiohook.c
Merged revisions 316265 via svnmerge from
2011-05-03 20:45:32 +00:00
autochan.c
Convert the ast_channel data structure over to the astobj2 framework.
2009-04-24 14:04:26 +00:00
autoservice.c
Merged revisions 278167 via svnmerge from
2010-07-20 22:26:23 +00:00
bridging.c
Send video update frame to new video source in follow_talker correctly.
2011-07-12 14:55:51 +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 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
Iterate though cdr.conf setting
2011-09-11 18:21:39 +00:00
cel.c
Merged revisions 337974 via svnmerge from
2011-09-26 19:40:12 +00:00
channel.c
Update SHA1 code to RFC 6234
2011-10-11 19:06:29 +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
Merged revisions 313860 via svnmerge from
2011-04-15 15:20:46 +00:00
config.c
Merged revisions 334297 via svnmerge from
2011-09-02 17:19:17 +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
Return error when no rows are deleted for AMI DBDelTree
2011-10-10 23:10:11 +00:00
devicestate.c
Merged revisions 294501 via svnmerge from
2010-11-10 12:52:46 +00:00
dial.c
Merged revisions 335078 via svnmerge from
2011-09-09 16:28:23 +00:00
dns.c
Fix a few compilation problems found when building Asterisk against uClibc.
2009-07-08 16:43:12 +00:00
dnsmgr.c
Additional updates for parsing dnsmgr.conf
2011-09-13 21:52:59 +00:00
dsp.c
Clean up dsp.conf parsing
2011-09-13 18:11:33 +00:00
ecdisa.h
…
enum.c
Allow ENUM query functions to report lookup errors
2011-08-09 17:08:33 +00:00
event.c
Merged revisions 337595,337597 via svnmerge from
2011-09-22 16:35:20 +00:00
features.c
Fix DTMF blind transfer continuing to execute dialplan after transfer.
2011-10-13 23:08:48 +00:00
file.c
Merged revisions 339088 via svnmerge from
2011-10-03 18:58:33 +00:00
fixedjitterbuf.c
Fix various typos reported by Lintian
2010-07-02 15:57:02 +00:00
fixedjitterbuf.h
Merged revisions 135841,135847,135850 via svnmerge from
2008-08-06 00:30:53 +00:00
format_cap.c
Merged revisions 336091 via svnmerge from
2011-09-15 15:19:51 +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
Adds pass-through support for codec CELT.
2011-07-07 19:39:17 +00:00
frame.c
Implement the '!' negation element to negate codecs directly in the allow keyword.
2011-09-07 00:54:36 +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
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
Add SRTP support for Asterisk
2010-06-08 05:29:08 +00:00
hashtab.c
Add MALLOC_DEBUG to various utility APIs, so that memory leaks can be tracked back to their source.
2009-03-11 00:29:59 +00:00
heap.c
Merged revisions 304950 via svnmerge from
2011-01-31 06:50:49 +00:00
http.c
Merged revisions 328247 via svnmerge from
2011-07-14 20:28:54 +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
Merged revisions 182810 via svnmerge from
2009-03-18 02:28:55 +00:00
jitterbuf.c
Merged revisions 174583 via svnmerge from
2009-02-10 18:16:31 +00:00
loader.c
Merged revisions 340109 via svnmerge from
2011-10-10 14:16:27 +00:00
lock.c
Merged revisions 314358 via svnmerge from
2011-04-20 05:28:36 +00:00
logger.c
Merged revisions 337974 via svnmerge from
2011-09-26 19:40:12 +00:00
Makefile
Merged revisions 336734 via svnmerge from
2011-09-19 20:31:09 +00:00
manager.c
Convert registered AMI actions to ao2 objects.
2011-10-11 18:57:47 +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 332560 via svnmerge from
2011-08-18 21:39:04 +00:00
netsock.c
Merged revisions 298051 via svnmerge from
2010-12-10 16:28:14 +00:00
pbx.c
Merged revisions 340109 via svnmerge from
2011-10-10 14:16:27 +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 336307 via svnmerge from
2011-09-16 21:20:02 +00:00
say.c
Merged revisions 339353 via svnmerge from
2011-10-04 19:51:27 +00:00
sched.c
Some scheduler API cleanup and improvements.
2010-12-20 17:15:54 +00:00
security_events.c
Merged revisions 337595,337597 via svnmerge from
2011-09-22 16:35:20 +00:00
sha1.c
Update SHA1 code to RFC 6234
2011-10-11 19:06:29 +00:00
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
pthread_self returns a pthread_t which is not an unsigned int on all
2009-07-09 08:31:24 +00:00
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
Add functions to map syslog facilities and priorities constants to strings.
2009-06-26 13:00:35 +00:00
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
Merge changes from str_substitution that are unrelated to that branch.
2009-04-01 20:13:28 +00:00
term.c
Merged revisions 330108 via svnmerge from
2011-07-28 21:46:27 +00:00
test.c
Merged revisions 332817 via svnmerge from
2011-08-22 19:19:44 +00:00
threadstorage.c
Fixed an issue in the threadstorage cli functions resulting from the constification of struct ast_cli_args in r196072.
2009-06-01 15:23:21 +00:00
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 339626 via svnmerge from
2011-10-06 17:54:42 +00:00
ulaw.c
Fix compile when certain G711 menuselect options are enabled.
2009-08-19 22:38:46 +00:00
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
Merged revisions 340109 via svnmerge from
2011-10-10 14:16:27 +00:00