sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
asterisk/main
History
Russell Bryant 2a25779d47 Merged revisions 335510 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r335510 | russell | 2011-09-13 02:24:34 -0500 (Tue, 13 Sep 2011) | 22 lines
  
  Merged revisions 335497 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r335497 | russell | 2011-09-13 02:11:36 -0500 (Tue, 13 Sep 2011) | 15 lines
    
    Fix a crash in res_ais.
    
    This patch resolves a crash observed in a load testing environment that
    involved the use of the res_ais module.  I observed some crashes where
    the event delivery callback would get called, but the length parameter
    incidcating how much data there was to read was 0.  The code assumed
    (with good reason I would think) that if this callback got called, there
    was an event available to read.  However, if the rare case that there's
    nothing there, catch it and return instead of blowing up.
    
    More specifically, the change always ensure that the size of the received
    event in the cluster is always big enough to be a real ast_event.
    
    Review: https://reviewboard.asterisk.org/r/1423/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335511 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 		2011-09-13 07:35:59 +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 330763 via svnmerge from 2011-08-03 15:16:25 +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 332817 via svnmerge from 2011-08-22 19:19:44 +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 332101 via svnmerge from 2011-08-16 17:23: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 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 283230 via svnmerge from 2010-08-23 13:23:37 +00:00
channel.c Merged revisions 335434 via svnmerge from 2011-09-12 15:56:27 +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 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 Use older functions out of deference to older distros 2011-07-07 16:50:54 +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 Merged revisions 323392,323394 via svnmerge from 2011-06-14 17:22:26 +00:00
dsp.c dsp_process was enhanced to work with alaw and ulaw in addition to slin. 2011-07-25 14:07:01 +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 335510 via svnmerge from 2011-09-13 07:35:59 +00:00
features.c Merged revisions 335078 via svnmerge from 2011-09-09 16:28:23 +00:00
file.c Merged revisions 332817 via svnmerge from 2011-08-22 19:19:44 +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 Adds pass-through support for codec CELT. 2011-07-07 19:39:17 +00:00
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
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 Merged revisions 329670 via svnmerge from 2011-07-27 15:26:31 +00:00
lock.c Merged revisions 314358 via svnmerge from 2011-04-20 05:28:36 +00:00
logger.c Merged revisions 334954 via svnmerge from 2011-09-08 22:30:42 +00:00
manager.c Merged revisions 332817 via svnmerge from 2011-08-22 19:19:44 +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 Support routing text messages outside of a call. 2011-06-01 21:31:40 +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 Merged revisions 335078 via svnmerge from 2011-09-09 16:28:23 +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 331894 via svnmerge from 2011-08-15 15:24:55 +00:00
say.c Merged revisions 330434 via svnmerge from 2011-08-01 15:24:21 +00:00
sched.c Some scheduler API cleanup and improvements. 2010-12-20 17:15:54 +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 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 316265 via svnmerge from 2011-05-03 20:45:32 +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 Replace ast_log(LOG_DEBUG, ...) with ast_debug() 2011-02-04 16:55:39 +00:00