kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 19:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
4ce624d57e478a3c83f905f02bb031da9b51d171
asterisk/main
History
Alec L Davis 4ce624d57e Merged revisions 287685 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r287685 | alecdavis | 2010-09-21 11:16:45 +1200 (Tue, 21 Sep 2010) | 18 lines
  
  ast_channel_masquerade: Avoid recursive masquerades.
  
  Check all 4 combinations of (original/clonechan) * (masq/masqr).
  
  Initially original->masq and clonechan->masqr were only checked.
  
  It's possible with multiple masq's planned - and not yet executed, that
   the 'original' chan could already have another masq'd into it - thus original->masqr
  would be set, that masqr would lost.
  Likewise for the clonechan->masq.
  
  (closes issue #16057;#17363)
  Reported by: amorsen;davidw,alecdavis
  Patches: 
        based on bug16057.diff4.txt uploaded by alecdavis (license 585)
  Tested by: ramonpeek, davidw, alecdavis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@287701 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-20 23:20:03 +00:00
..
db1-ast
Merged revisions 209879 via svnmerge from
2009-08-01 11:29:25 +00:00
editline
Revert r280019 for now - This was poorly executed.
2010-07-27 22:30:38 +00:00
stdtime
Support setting locale per-mailbox (changes date/time languages for email, pager messages).
2010-06-01 21:28:19 +00:00
abstract_jb.c
Fix jitterbuffer logging not creating logfiles.
2010-03-10 18:25:18 +00:00
acl.c
Make ACLs IPv6-capable.
2010-07-19 14:17:16 +00:00
alaw.c
Fix compile when certain G711 menuselect options are enabled.
2009-08-19 22:38:46 +00:00
aoc.c
Generic Advice of Charge.
2010-06-02 18:10:15 +00:00
app.c
ast_callerid restructuring
2010-07-14 15:48:36 +00:00
ast_expr2.c
Allow "REMAINDER" to function properly in expressions.
2009-12-28 22:09:40 +00:00
ast_expr2.fl
Merged revisions 245496 via svnmerge from
2010-02-08 20:41:05 +00:00
ast_expr2.h
Merged revisions 179807 via svnmerge from
2009-03-03 22:12:02 +00:00
ast_expr2.y
Merged revisions 267009 via svnmerge from
2010-06-02 17:25:05 +00:00
ast_expr2f.c
Fix some doxygen warnings.
2010-06-08 14:38:18 +00:00
asterisk.c
Merged revisions 284593,284595 via svnmerge from
2010-09-02 05:00:34 +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
Add SRTP support for Asterisk
2010-06-08 05:29:08 +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
Improve some very confusing structure names in astobj2.c
2010-05-16 11:14:37 +00:00
audiohook.c
Merged revisions 279946 via svnmerge from
2010-07-27 20:57:00 +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
pthread_join to assure the thread is really gone
2010-06-02 13:32:22 +00:00
buildinfo.c
fix a few small things found by using sparse
2008-10-30 16:49:02 +00:00
callerid.c
ast_callerid restructuring
2010-07-14 15:48:36 +00:00
ccss.c
Separate call completion config parameter allocation and default initialization.
2010-08-12 22:06:06 +00:00
cdr.c
Merged revisions 287115 via svnmerge from
2010-09-16 19:54:48 +00:00
cel.c
Make the AST_CEL_AMA enum match up with the AST_CDR_ ama flag values.
2010-08-23 13:23:12 +00:00
channel.c
Merged revisions 287685 via svnmerge from
2010-09-20 23:20:03 +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
Add a "core reload" CLI command.
2010-08-12 20:41:17 +00:00
config.c
Merged revisions 283881 via svnmerge from
2010-08-27 20:31:55 +00:00
cygload.c
Doxygen updates, formatting.
2007-12-11 22:20:22 +00:00
data.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
datastore.c
Merged revisions 273565 via svnmerge from
2010-07-01 22:16:23 +00:00
db.c
Rate limit calls to fsync() to 1 per second after astdb updates.
2010-09-10 20:31:58 +00:00
devicestate.c
Merged revisions 263639 via svnmerge from
2010-05-17 22:08:01 +00:00
dial.c
ast_callerid restructuring
2010-07-14 15:48:36 +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
Formatting changes
2010-07-16 13:32:22 +00:00
dsp.c
Set threshold for silence detection defaults to 256
2010-06-07 17:34:45 +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
Resolve an invalid memory read on an event.
2010-06-09 21:11:43 +00:00
features.c
fix uninintialized variable
2010-09-15 20:58:39 +00:00
file.c
Merged revisions 286268 via svnmerge from
2010-09-11 17:09:22 +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
frame.c
adds speex 16khz audio support
2010-06-17 17:23:43 +00:00
framehook.c
Addition of the FrameHook API (AKA AwesomeHooks)
2010-09-20 22:09:16 +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
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
Fix handling of removing nodes from the middle of a heap.
2010-05-06 13:58:07 +00:00
http.c
Use ast_sockaddr_setnull() when http is not enabled.
2010-07-27 01:53:38 +00:00
image.c
More 'static' qualifiers on module global variables.
2009-06-15 17:34:30 +00:00
indications.c
Implement AstData API data providers as part of the GSOC 2010 project,
2010-07-08 14:48:42 +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
When optional_api is non-optional, force dependent modules to be loaded.
2010-09-02 05:20:59 +00:00
lock.c
Attempt to fix FreeBSD build problem.
2010-06-09 23:56:08 +00:00
logger.c
Fixes an error with the logger that caused verbose messages to be spammed to the
2010-09-20 21:19:12 +00:00
Makefile
Make this a little more deterministic... we want the latest value, not just a 1 somewhere.
2010-08-02 14:41:46 +00:00
manager.c
Merged revisions 287470 via svnmerge from
2010-09-19 16:09:28 +00:00
md5.c
Start untangling header inclusion in a way that does not affect
2007-11-16 20:04:58 +00:00
netsock2.c
Only output debugging if the debug level is on.
2010-08-19 14:44:51 +00:00
netsock.c
fixes an ast_netsock_list memory leak.
2009-10-08 19:35:30 +00:00
pbx.c
Merged revisions 287558 via svnmerge from
2010-09-20 15:57:14 +00:00
plc.c
Start untangling header inclusion in a way that does not affect
2007-11-16 20:04:58 +00:00
poll.c
Merged revisions 285267 via svnmerge from
2010-09-07 19:08:09 +00:00
privacy.c
remove a bunch of useless #include "options.h"
2007-11-21 23:09:02 +00:00
rtp_engine.c
Fix SRTP for changing SSRC and multiple a=crypto SDP lines
2010-09-01 18:44:36 +00:00
say.c
Fix various typos reported by Lintian
2010-07-02 15:57:02 +00:00
sched.c
Merged revisions 281574 via svnmerge from
2010-08-10 18:05:07 +00:00
security_events.c
Add an API for reporting security events, and a security event logging module.
2009-07-11 19:15:03 +00:00
sha1.c
more header removal/normalization
2007-11-21 00:23:49 +00:00
slinfactory.c
Expand codec bitfield from 32 bits to 64 bits.
2009-11-04 14:05:12 +00:00
srv.c
Formatting changes
2010-07-16 13:32:22 +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
Don't allow file descriptors to go above 64k, when we're closing them in a fork(2).
2010-04-30 06:19:35 +00:00
strings.c
fixes segfault on logging
2010-05-18 22:48:51 +00:00
stun.c
Merged revisions 284593,284595 via svnmerge from
2010-09-02 05:00:34 +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
Minor tweaks to comment blocks and includes.
2010-02-22 06:45:52 +00:00
tcptls.c
Add IPv6 to Asterisk.
2010-07-08 22:08:07 +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
Revert r280019 for now - This was poorly executed.
2010-07-27 22:30:38 +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
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
Extend max call limit duration from 24.8 days to 292+ million years.
2010-01-18 22:31:25 +00:00
translate.c
improved translation paths for wideband codecs
2010-08-12 20:15:41 +00:00
udptl.c
Allow IPv6 addresses for UDPTL streams.
2010-07-23 15:16:33 +00:00
ulaw.c
Fix compile when certain G711 menuselect options are enabled.
2009-08-19 22:38:46 +00:00
utils.c
Fix alignment of stringfields on the SPARC architecture
2010-08-06 18:57:10 +00:00
xml.c
Asterisk data retrieval API.
2010-04-22 18:07:02 +00:00
xmldoc.c
Revert r280019 for now - This was poorly executed.
2010-07-27 22:30:38 +00:00