asterisk/main
Richard Mudgett be74e6f16e Clean-up on isle five for __ast_request_and_dial() and ast_call_forward().
* Add locking when a channel inherits variables and datastores in
__ast_request_and_dial() and ast_call_forward().  Note: The involved
channels are not active so there was minimal potential for problems.

* Remove calls to ast_set_callerid() in __ast_request_and_dial() and
ast_call_forward() because the set information is for the wrong direction.

* Don't use C++ keywords for variable names in ast_call_forward().

* Run the redirecting interception macro if defined when forwarding a call
in ast_call_forward().  Note: Currently will never execute because the
only callers that supply a calling channel supply a hungup or zombie
channel.

* Make feature_request_and_dial() put the transferee into autoservice when
it calls ast_call_forward() in case a redirection interception macro is
run.  Note: Currently will never happen because the caller channel (Party
B) is always hungup at this time.

* Make feature_request_and_dial() ignore the AST_CONTROL_PROCEEDING frame
to silence a log message.
........

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@348466 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-12-16 23:58:44 +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
Makefile Merged revisions 336734 via svnmerge from 2011-09-19 20:31:09 +00:00
abstract_jb.c Introduction of the JITTERBUFFER dialplan function. 2011-04-20 20:52:15 +00:00
acl.c Fix calls to ast_get_ip() not initializing the address family. 2011-11-23 23:03:32 +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 Backed out core changes from r346391 2011-12-12 19:35:08 +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 Check fopen return value for ao2 reference debug output. 2011-10-25 22:06:43 +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 Allow each logging destination and console to have its own notion of the verbosity level. 2011-11-29 18:43:16 +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 Clean-up on isle five for __ast_request_and_dial() and ast_call_forward(). 2011-12-16 23:58:44 +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 Backed out core changes from r346391 2011-12-12 19:35:08 +00:00
config.c Backed out core changes from r346391 2011-12-12 19:35:08 +00:00
cygload.c Doxygen updates, formatting. 2007-12-11 22:20:22 +00:00
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 Add ASTSBINDIR to the list of configurable paths 2011-12-07 20:15:29 +00:00
devicestate.c Merged revisions 294501 via svnmerge from 2010-11-10 12:52:46 +00:00
dial.c Allow each logging destination and console to have its own notion of the verbosity level. 2011-11-29 18:43:16 +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 Fix dnsmgr entries to ask for the same address family each time. 2011-11-22 23:06:11 +00:00
dsp.c tweak the v21 detector to detect an additional pattern of hits and misses 2011-10-27 20:11:11 +00:00
ecdisa.h merge new_loader_completion branch, including (at least): 2006-08-21 02:11:39 +00:00
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 Clean-up on isle five for __ast_request_and_dial() and ast_call_forward(). 2011-12-16 23:58:44 +00:00
file.c Video format was treated as audio when removed from the file playback scheduler 2011-11-11 21:57:46 +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.c list all of the codecs associated with a particular format id for CLI command "core show codec" 2011-11-07 18:42:04 +00:00
format_cap.c Misc format capability fixes. 2011-10-31 17:51:22 +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
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.c (Step 2 of 2) 2008-07-21 21:00:47 +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
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 Backed out core changes from r346391 2011-12-12 19:35:08 +00:00
lock.c Merged revisions 314358 via svnmerge from 2011-04-20 05:28:36 +00:00
logger.c Backed out core changes from r346391 2011-12-12 19:35:08 +00:00
manager.c Update AMI Getvar and Setvar documentation about supplying a channel name. 2011-12-07 21:42:29 +00:00
md5.c Start untangling header inclusion in a way that does not affect 2007-11-16 20:04:58 +00:00
message.c Merged revisions 346349 via svnmerge from 2011-11-29 00:03:36 +00:00
netsock.c Merged revisions 298051 via svnmerge from 2010-12-10 16:28:14 +00:00
netsock2.c Merged revisions 332560 via svnmerge from 2011-08-18 21:39:04 +00:00
pbx.c Fix crash during CDR update. 2011-12-16 21:10:19 +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 remove a bunch of useless #include "options.h" 2007-11-21 23:09:02 +00:00
rtp_engine.c Merged revisions 336307 via svnmerge from 2011-09-16 21:20:02 +00:00
say.c Allow each logging destination and console to have its own notion of the verbosity level. 2011-11-29 18:43:16 +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 Re-resolve the STUN address if a STUN poll fails for res_stun_monitor. 2011-12-01 21:19:41 +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 Remove the few places where we try to ast_verbose() without a newline. 2011-11-30 23:38:34 +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 Correct the default udptl port range. 2011-11-07 19:58:44 +00:00
ulaw.c Fix compile when certain G711 menuselect options are enabled. 2009-08-19 22:38:46 +00:00
utils.c Use __alignof__ instead of sizeof for stringfield length storage. 2011-11-11 22:00:14 +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