Jason Parker [Tue, 30 Jun 2009 18:48:35 +0000 (18:48 +0000)]
Merged revisions 204474 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r204474 | qwell | 2009-06-30 13:47:06 -0500 (Tue, 30 Jun 2009) | 1 line
Fix ast_say_counted_noun to correctly handle Polish. Fix a comment typo in passing.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204475
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Tue, 30 Jun 2009 18:36:24 +0000 (18:36 +0000)]
Recorded merge of revisions 204469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r204469 | tilghman | 2009-06-30 13:23:35 -0500 (Tue, 30 Jun 2009) | 11 lines
"tw" is the language specification for Twi (from Ghana) not Taiwanese.
(closes issue #15346)
Reported by: volivier
Patches:
20090617__issue15346__1.4.diff.txt uploaded by tilghman (license 14)
20090617__issue15346__trunk.diff.txt uploaded by tilghman (license 14)
20090617__issue15346__1.6.0.diff.txt uploaded by tilghman (license 14)
20090617__issue15346__1.6.1.diff.txt uploaded by tilghman (license 14)
20090617__issue15346__1.6.2.diff.txt uploaded by tilghman (license 14)
Tested by: volivier
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204470
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 30 Jun 2009 17:22:16 +0000 (17:22 +0000)]
Rename res_config_sqlite.conf to res_config_sqlite.conf.sample (missing .sample).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204440
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 30 Jun 2009 17:18:18 +0000 (17:18 +0000)]
Rename ooh323.conf to chan_ooh323.conf, make module support both names
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204428
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 30 Jun 2009 17:16:56 +0000 (17:16 +0000)]
Rename mobile.conf to chan_mobile.conf, make module support old name, too
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204423
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 30 Jun 2009 17:15:09 +0000 (17:15 +0000)]
Rename res_mysql.conf to res_config_mysql.conf, make module support both
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204422
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 30 Jun 2009 17:11:31 +0000 (17:11 +0000)]
Make addons build last - this is for Qwell.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204420
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 30 Jun 2009 17:10:45 +0000 (17:10 +0000)]
Rename mysql.conf to app_mysql.conf, make module support both names
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204419
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 30 Jun 2009 17:09:04 +0000 (17:09 +0000)]
Rename cdr_addon_mysql to cdr_mysql
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204418
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 30 Jun 2009 17:08:14 +0000 (17:08 +0000)]
Rename app_addon_sql_mysql to app_mysql
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204417
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 30 Jun 2009 17:04:35 +0000 (17:04 +0000)]
Add-ons related build system improvements.
Ensure that add-on modules can be embedded, fix up Makefile.moddir_rules
to allow module directory Makefiles to more easily specify the modules to
be built, and explicitly list the addons modules in its Makefile, since
the module names don't follow any pattern.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204415
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 30 Jun 2009 16:40:38 +0000 (16:40 +0000)]
Move Asterisk-addons modules into the main Asterisk source tree.
Someone asked yesterday, "is there a good reason why we can't just put these
modules in Asterisk?". After a brief discussion, as long as the modules are
clearly set aside in their own directory and not enabled by default, it is
perfectly fine.
For more information about why a module goes in addons, see README-addons.txt.
chan_ooh323 does not currently compile as it is behind some trunk API updates.
However, it will not build by default, so it should be okay for now.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204413
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Mon, 29 Jun 2009 23:50:46 +0000 (23:50 +0000)]
A few const changes in app_meetme.c that I noticed while browsing the source.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204355
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 29 Jun 2009 22:50:35 +0000 (22:50 +0000)]
Merged revisions 204300 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r204300 | mmichelson | 2009-06-29 17:45:34 -0500 (Mon, 29 Jun 2009) | 9 lines
Add error message so that it is clear why a SIP peer was not processed when
a DNS lookup fails on a host or outboundproxy.
(closes issue #13432)
Reported by: p_lindheimer
Patches:
outboundproxy.patch uploaded by p (license 558)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204301
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 29 Jun 2009 21:48:54 +0000 (21:48 +0000)]
Merged revisions 204243,204246 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r204243 | mmichelson | 2009-06-29 16:23:43 -0500 (Mon, 29 Jun 2009) | 22 lines
Fix a problem where chan_sip would ignore "old" but valid responses.
chan_sip has had a problem for quite a long time that would manifest when
Asterisk would send multiple SIP responses on the same dialog before receiving
a response. The problem occurred because chan_sip only kept track of the highest
outgoing sequence number used on the dialog. If Asterisk sent two requests out,
and a response arrived for the first request sent, then Asterisk would ignore
the response. The result was that Asterisk would continue retransmitting the
requests and ignoring the responses until the maximum number of retransmissions
had been reached.
The fix here is to rearrange the code a bit so that instead of simply comparing
the sequence number of the response to our latest outgoing sequence number, we
walk our list of outstanding packets and determine if there is a match. If there is,
we continue. If not, then we ignore the response.
In doing this, I found a few completely useless variables that I have now removed.
(closes issue #11231)
Reported by: flefoll
Review: https://reviewboard.asterisk.org/r/298
........
r204246 | mmichelson | 2009-06-29 16:37:05 -0500 (Mon, 29 Jun 2009) | 3 lines
Fix build oops.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204247
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Mon, 29 Jun 2009 20:29:10 +0000 (20:29 +0000)]
Reorganize this adaptive CEL config a bit.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204217
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 29 Jun 2009 19:36:57 +0000 (19:36 +0000)]
Blocked revisions 204170 via svnmerge
........
r204170 | tilghman | 2009-06-29 14:36:01 -0500 (Mon, 29 Jun 2009) | 3 lines
Revision 189537 was supposed to make 1.4 more correct. Instead, it broke func_odbc. Reverting.
(closes issue #15317, issue #14614)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204171
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Mon, 29 Jun 2009 18:44:44 +0000 (18:44 +0000)]
Get app_rpt compiling again. I doubt seriously that it actually works.
Also, the code in this module is horrendous and we should remove it from the
tree. I'm not sure who is supposed to be maintaning this thing, but they
clearly are not. I don't see the sense of leaving it in the main tree. If it
lives *anywhere* it should be in addons.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204143
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Mon, 29 Jun 2009 18:05:27 +0000 (18:05 +0000)]
Add common headers to CEL related configs.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204119
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 29 Jun 2009 17:56:29 +0000 (17:56 +0000)]
Allow trunk to once again compile under MALLOC_DEBUG
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204118
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 29 Jun 2009 17:15:15 +0000 (17:15 +0000)]
Remove invalid entries in the config.
This might seem like a legitimate comment that merely needed semicolon
prefixes, but in reality, the adaptive layer is designed to allow arbitrary
CDR variables, without needing the use of a userfield to store multiple items.
It's therefore not only invalid syntax but also goes against the intent of the
adaptive method.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204069
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 29 Jun 2009 15:04:39 +0000 (15:04 +0000)]
Blocked revisions 204012 via svnmerge
........
r204012 | mmichelson | 2009-06-29 10:04:17 -0500 (Mon, 29 Jun 2009) | 6 lines
Place unlock of mutex in an else block so that it does not get unlocked twice.
(closes issue #15400)
Reported by: aragon
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204013
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Sat, 27 Jun 2009 20:26:01 +0000 (20:26 +0000)]
Another CHANGES spelling fix.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203985
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 27 Jun 2009 10:04:51 +0000 (10:04 +0000)]
Only update total silence counter after a counter reset.
(closes issue #2264)
Reported by: pfn
Patches:
silent-vm-1.6.2-fix2.txt uploaded by pfn (license 810)
Tested by: pfn
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203962
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 27 Jun 2009 09:51:45 +0000 (09:51 +0000)]
Minor tweaks and spelling fixes for CHANGES and UPGRADE.txt.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203960
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Sat, 27 Jun 2009 01:07:52 +0000 (01:07 +0000)]
Merged revisions 203908 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r203908 | rmudgett | 2009-06-26 19:55:12 -0500 (Fri, 26 Jun 2009) | 16 lines
The ISDN CPE side should not exclusively pick B channels normally.
Before this patch, Asterisk unconditionally picked B channels exclusively
on the CPE side and normally allowed alternative B channels on the network
side. Now Asterisk does the opposite.
Reasons for the CPE side to normally not pick B channels exclusively:
* For CPE point-to-multipoint mode (i.e. phone side), the CPE side does
not have enough information to exclusively pick B channels. (There may be
other devices on the line.)
* Q.931 gives preference to the network side picking B channels.
* Some telcos require the CPE side to not pick B channels exclusively.
(closes issue #14383)
Reported by: mbrancaleoni
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203909
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Fri, 26 Jun 2009 22:11:31 +0000 (22:11 +0000)]
Merged revisions 203848 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r203848 | jpeeler | 2009-06-26 17:09:19 -0500 (Fri, 26 Jun 2009) | 5 lines
Make sure to recreate the dahdi pseudo channel after dahdi restart
(closes issue #14477)
Reported by: timking
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203853
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Fri, 26 Jun 2009 22:08:05 +0000 (22:08 +0000)]
Add a new module, cdr_syslog, which allows writing CDRs to syslog.
The original patch for this was written by Brett Bryant, and I split it out into
it's own module.
(closes issue #12876)
Reported by: bbryant
Patches:
06162008_cdr_custom_syslog.diff uploaded by bbryant (license 36)
05212009_cdr_syslog.patch uploaded by seanbright (license 71)
Tested by: seanbright
Review: https://reviewboard.asterisk.org/r/297/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203846
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 26 Jun 2009 21:48:41 +0000 (21:48 +0000)]
Add 's' option to ChanSpy, which makes the app exit when no channels are left to spy on.
(closes issue #14594)
Reported by: JimDickenson
Patches:
chanspy.diff uploaded by JimDickenson (license 710)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203842
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 26 Jun 2009 21:21:48 +0000 (21:21 +0000)]
Merged revisions 203785 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r203785 | russell | 2009-06-26 16:16:39 -0500 (Fri, 26 Jun 2009) | 15 lines
Don't fast forward past the end of a message.
This is nice change for users of the voicemail application. If someone gets a
little carried away with fast forwarding through a message, they can easily
get to the end and accidentally exit the voicemail application by hitting the
fast forward key during the following prompt.
This adds some safety by not allowing a fast forward past the end of a message.
(closes issue #14554)
Reported by: lacoursj
Patches:
21761.patch uploaded by lacoursj (license 707)
Tested by: lacoursj
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203802
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 26 Jun 2009 20:52:19 +0000 (20:52 +0000)]
Add timestamp to response to "Ping" manager action.
(closes issue #14596)
Reported by: JimDickenson
Patches:
pong2.diff uploaded by JimDickenson (license 710)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203783
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 26 Jun 2009 20:45:00 +0000 (20:45 +0000)]
Ensure the TCP read buffer is fully initialized before handling each packet.
(closes issue #14452)
Reported by: umberto71
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203779
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 26 Jun 2009 20:19:49 +0000 (20:19 +0000)]
Fix the 'nat' option to actually do RFC3581 as expected and extend the configurable values for finer control.
(closes issue #8855)
Reported by: mikma
Tested by: klaus3000, file
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203735
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David Brooks [Fri, 26 Jun 2009 20:13:51 +0000 (20:13 +0000)]
Fixing voicemail's error in checking max silence vs min message length
Max silence was represented in milliseconds, yet vmminsecs (minmessage) was represented
as seconds.
Also, the inequality was reversed. The warning, if triggered, was "Max silence should
be less than minmessage or you may get empty messages", which should have been logged
if max silence was greater than minmessage, but the check was for less than.
Also, conforming if statement to coding guidelines.
closes issue #15331)
Reported by: markd
Review: https://reviewboard.asterisk.org/r/293/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203721
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David Brooks [Fri, 26 Jun 2009 20:11:47 +0000 (20:11 +0000)]
Blocked revisions 203719 via svnmerge
........
r203719 | dbrooks | 2009-06-26 15:03:42 -0500 (Fri, 26 Jun 2009) | 16 lines
Fixing voicemail's error in checking max silence vs min message length
Max silence was represented in milliseconds, yet vmminsecs (minmessage) was represented
as seconds.
Also, the inequality was reversed. The warning, if triggered, was "Max silence should
be less than minmessage or you may get empty messages", which should have been logged
if max silence was greater than minmessage, but the check was for less than.
Also, conforming if statement to coding guidelines.
closes issue #15331)
Reported by: markd
Review: https://reviewboard.asterisk.org/r/293/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203720
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David Vossel [Fri, 26 Jun 2009 19:47:11 +0000 (19:47 +0000)]
moving debug message from level 0 to 1.
(closes issue #15404)
Reported by: leobrown
Patches:
iax_codec_debug.patch uploaded by leobrown (license 541)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203710
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 26 Jun 2009 19:31:14 +0000 (19:31 +0000)]
Make invalid hints report Unavailable instead of Idle.
(closes issue #14413)
Reported by: pj
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203702
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 26 Jun 2009 19:27:24 +0000 (19:27 +0000)]
Improve T.38 negotiation by exchanging session parameters between application and channel.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203699
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Fri, 26 Jun 2009 19:03:25 +0000 (19:03 +0000)]
Check if polarityonanswerdelay has elapsed before setting a channel as answered
after a polarity reversal.
Previously on a polarity switch event chan_dahdi would set the channel
immediately as answered. This would cause problems if a polarity reversal
occurred when the line was picked up as the dial would not have yet occurred.
Now if the polarity reversal occurs before delay has elapsed after coming off
hook or an answer, it is ignored. Also, some refactoring was done in
_handle_event.
(closes issue #13917)
Reported by: alecdavis
Patches:
chan_dahdi.bug13917.feb09.diff2.txt uploaded by alecdavis (license 585)
Tested by: alecdavis
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203672
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 26 Jun 2009 15:42:26 +0000 (15:42 +0000)]
Note a new API call, and one that changed in doxygen.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203640
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 26 Jun 2009 15:28:53 +0000 (15:28 +0000)]
Merge the new Channel Event Logging (CEL) subsystem.
CEL is the new system for logging channel events. This was inspired after
facing many problems trying to represent what is possible to happen to a call
in Asterisk using CDR records. For more information on CEL, see the built in
HTML or PDF documentation generated from the files in doc/tex/.
Many thanks to Steve Murphy (murf) and Brian Degenhardt (bmd) for their hard
work developing this code. Also, thanks to Matt Nicholson (mnicholson) and
Sean Bright (seanbright) for their assistance in the final push to get this
code ready for Asterisk trunk.
Review: https://reviewboard.asterisk.org/r/239/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203638
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Fri, 26 Jun 2009 13:00:35 +0000 (13:00 +0000)]
Add functions to map syslog facilities and priorities constants to strings.
Also change the default casing of the string contants to lowercase. This really
just saves us from have to lowercase them later when displaying them.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203605
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Fri, 26 Jun 2009 03:06:06 +0000 (03:06 +0000)]
Add checks in configure for non-POSIX syslog facilities.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203569
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 26 Jun 2009 00:23:55 +0000 (00:23 +0000)]
One more formatting nit ... use spaces for inline indentation.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203534
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 26 Jun 2009 00:21:09 +0000 (00:21 +0000)]
Convert spaces to tabs for indentation.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203525
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Thu, 25 Jun 2009 23:54:03 +0000 (23:54 +0000)]
Move syslog utility functions into a separate file so they can be re-used.
This has the pleasant side effect of cleaning up the header inclusion process
in logger.c.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203508
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Thu, 25 Jun 2009 22:48:33 +0000 (22:48 +0000)]
make sure chan_dahdi compiles with only libss7 and not libpri installed
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203479
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David Vossel [Thu, 25 Jun 2009 21:45:32 +0000 (21:45 +0000)]
fixes a few redundant conditions
(issue #15269)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203444
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Thu, 25 Jun 2009 21:34:18 +0000 (21:34 +0000)]
Picking nits
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203443
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Thu, 25 Jun 2009 21:22:12 +0000 (21:22 +0000)]
Remove some unnecessary code and update sample config file with respect to GR-303.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203402
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Terry Wilson [Thu, 25 Jun 2009 21:15:11 +0000 (21:15 +0000)]
Merged revisions 203380 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r203380 | twilson | 2009-06-25 16:13:10 -0500 (Thu, 25 Jun 2009) | 4 lines
I didn't see that Mark already fixed the underlying issue!
Yay for removing useless code.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203381
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 25 Jun 2009 21:04:55 +0000 (21:04 +0000)]
Merged revisions 203375 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r203375 | russell | 2009-06-25 16:02:18 -0500 (Thu, 25 Jun 2009) | 9 lines
Fix a case where CDR answer time could be before the start time involving parking.
(closes issue #13794)
Reported by: davidw
Patches:
13794.patch uploaded by murf (license 17)
13794.patch.160 uploaded by murf (license 17)
Tested by: murf, dbrooks
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203376
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Terry Wilson [Thu, 25 Jun 2009 20:25:39 +0000 (20:25 +0000)]
Merged revisions 203311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r203311 | twilson | 2009-06-25 15:09:15 -0500 (Thu, 25 Jun 2009) | 2 lines
Don't try to free NULL
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203338
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Thu, 25 Jun 2009 19:54:12 +0000 (19:54 +0000)]
New signaling module to handle PRI/BRI operations in chan_dahdi
This merge splits the PRI/BRI signaling logic out of chan_dahdi.c into
sig_pri.c. Functionality in theory should not change (mostly). A few trivial
changes were made in sig_analog with verbose messages and commenting.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203304
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Thu, 25 Jun 2009 19:22:46 +0000 (19:22 +0000)]
Unmute when we get a dtmfup (we muted on dtmfdown) event.
This would occasionally cause one-way audio when using hardware DTMF detection.
(closes issue #14761)
Reported by: tzafrir
Patches:
v1-14761.patch uploaded by dimas (license 88)
Tested by: tzafrir, dimas
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203258
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 25 Jun 2009 18:53:12 +0000 (18:53 +0000)]
Blocked revisions 203230 via svnmerge
........
r203230 | mmichelson | 2009-06-25 13:52:22 -0500 (Thu, 25 Jun 2009) | 3 lines
Prevent false positives when freeing a NULL pointer with MALLOC_DEBUG enabled.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203231
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 25 Jun 2009 18:25:24 +0000 (18:25 +0000)]
Add support for multicast RTP paging.
(closes issue #11797)
Reported by: macbrody
Review: https://reviewboard.asterisk.org/r/270/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203227
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Thu, 25 Jun 2009 17:01:32 +0000 (17:01 +0000)]
Pass a logmsg to ast_log_vsyslog instead of separate arguments.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203188
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Doug Bailey [Thu, 25 Jun 2009 16:18:48 +0000 (16:18 +0000)]
Insure ring cadence is set for fxs ports
Moved SETCADENCE ioctl call to before call into new analog signal module
to insure that it gets set.
(closes issue #15381)
Reported by: alecdavis
Patches:
fix15381.diff uploaded by dbailey (license 819)
Tested by: dbailey
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203126
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 25 Jun 2009 16:04:10 +0000 (16:04 +0000)]
Merged revisions 203115 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r203115 | russell | 2009-06-25 11:02:16 -0500 (Thu, 25 Jun 2009) | 11 lines
Resolve a crash related to a T.38 reinvite race condition.
This change resolves a crash observed locally during some T.38 testing.
A call was set up using a call file, and when the T.38 reinvite came in,
the channel state was still AST_STATE_DOWN. The reason is explained by
a comment in the code that previously lived in the handling of
AST_STATE_RINGING. This change modifies the logic to handle the same
race condition for any channel state that is not UP.
(closes ABE-1895)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203116
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Wed, 24 Jun 2009 21:08:55 +0000 (21:08 +0000)]
Merged revisions 203036 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r203036 | rmudgett | 2009-06-24 16:01:43 -0500 (Wed, 24 Jun 2009) | 8 lines
Improved chan_dahdi.conf pritimer error checking.
Valid format is: pritimer=timer_name,timer_value
* Fixed segfault if the ',' is missing.
* Completely check the range returned by pri_timer2idx() to prevent
possible access outside array bounds.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203037
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 24 Jun 2009 18:29:10 +0000 (18:29 +0000)]
Merged revisions 202966 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r202966 | mmichelson | 2009-06-24 13:28:47 -0500 (Wed, 24 Jun 2009) | 3 lines
Use the handy UNLINK macro instead of hand-coding the same thing in-line.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202967
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Wed, 24 Jun 2009 18:08:17 +0000 (18:08 +0000)]
Ensure the default settings are applied for T.38 when we set it up for a peer.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202925
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Wed, 24 Jun 2009 13:53:49 +0000 (13:53 +0000)]
Ignore some files generated when asterisk.pdf is created.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202889
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Wed, 24 Jun 2009 13:47:55 +0000 (13:47 +0000)]
Update sample cdr_tds configuration to try and eliminate some confusion.
Also change the preferred configuration option from 'hostname' (which was
misleading because it didn't actually treat the value as a hostname) to
'connection' and added some verbage explaining that the user would need to
refer to their freetds.conf file for those settings. 'hostname' was kept
as a backwards compatible configuration parameter.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202887
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Tue, 23 Jun 2009 23:57:07 +0000 (23:57 +0000)]
Change some section names in the CDR tex documentation.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202841
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Tue, 23 Jun 2009 23:53:45 +0000 (23:53 +0000)]
Remove some trailing whitespace before making content changes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202840
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 23 Jun 2009 22:47:26 +0000 (22:47 +0000)]
Clean up section hierarchy for the CDR chapter.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202804
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Fredrickson [Tue, 23 Jun 2009 22:08:43 +0000 (22:08 +0000)]
I could have sworn I committed this patch ages ago, but... bug fix with setting NAI properly on linksets in certain situations.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202761
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 23 Jun 2009 21:38:21 +0000 (21:38 +0000)]
Make outgoing_colp=2 misdn.conf port parameter not send redirecting or transfer messages.
If the outgoing_colp parameter is set to not send COLP information, then
it does not make sense to send redirecting or transfer messages announcing
new COLP information that is blocked. The service provider may supply the
listed number for that line when it passes the messages to the next hop.
Why tell the switch that these events happened when the information is
otherwise suppressed?
Also blocked the number of previous redirects that may have occurred to
calls going out the port when outgoing_colp is 2.
Follow on to JIRA ABE-1853.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202755
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Ryan Brindley [Tue, 23 Jun 2009 21:25:17 +0000 (21:25 +0000)]
If we delete the info, lets also delete the lines
(closes issue #14509)
Reported by: timeshell
Patches:
20090504__bug14509.diff.txt uploaded by tilghman (license 14)
Tested by: awk, timeshell
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202753
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David Vossel [Tue, 23 Jun 2009 16:31:30 +0000 (16:31 +0000)]
Merged revisions 202671 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r202671 | dvossel | 2009-06-23 11:28:46 -0500 (Tue, 23 Jun 2009) | 12 lines
MWI NOTIFY contains a wrong URI if Asterisk listens to non-standard port and transport
(closes issue #14659)
Reported by: klaus3000
Patches:
patch_chan_sip_fixMWIuri_1.4.txt uploaded by klaus3000 (license 65)
mwi_port-transport_trunk.diff uploaded by dvossel (license 671)
Tested by: dvossel, klaus3000
Review: https://reviewboard.asterisk.org/r/288/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202672
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 23 Jun 2009 15:23:00 +0000 (15:23 +0000)]
Blocked revisions 202601 via svnmerge
........
r202601 | mmichelson | 2009-06-23 10:22:35 -0500 (Tue, 23 Jun 2009) | 3 lines
Fix more memory leaks that may result if rtp is not successfully allocated.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202603
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 23 Jun 2009 15:11:47 +0000 (15:11 +0000)]
Blocked revisions 202572 via svnmerge
........
r202572 | mmichelson | 2009-06-23 10:08:27 -0500 (Tue, 23 Jun 2009) | 3 lines
Fix potential memory leak in chan_sip when video rtp is not allocated properly.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202574
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 23 Jun 2009 14:54:21 +0000 (14:54 +0000)]
Ignore voicemail messages that are just silence.
(closes issue #2264)
Reported by: pfn
Patches:
silent-vm-1.6.2.txt uploaded by pfn (license 810)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202570
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 22 Jun 2009 20:11:04 +0000 (20:11 +0000)]
Merged revisions 202496 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r202496 | russell | 2009-06-22 15:08:53 -0500 (Mon, 22 Jun 2009) | 4 lines
Report CallerID change during a masquerade.
Reported by: markster
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202497
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Mon, 22 Jun 2009 16:09:50 +0000 (16:09 +0000)]
Fix lock usage in cdr_sqlite3_custom to avoid potential crashes during reload.
Pointed out by Russell while working on the CEL branch.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202417
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 22 Jun 2009 16:05:08 +0000 (16:05 +0000)]
Merged revisions 202414 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r202414 | russell | 2009-06-22 11:00:00 -0500 (Mon, 22 Jun 2009) | 2 lines
Make Polycom subscription type override check more explicit.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202415
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David Vossel [Mon, 22 Jun 2009 15:33:35 +0000 (15:33 +0000)]
attempting to load running modules
Modules placed in the priority heap for loading were not properly removed from the linked list. This resulted in some modules attempting to load twice.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202410
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 22 Jun 2009 14:58:24 +0000 (14:58 +0000)]
Merged revisions 202341-202342 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r202341 | mmichelson | 2009-06-22 09:42:55 -0500 (Mon, 22 Jun 2009) | 26 lines
Fix a situation in which Asterisk would not stop retransmitting 487s.
If a CANCEL were received by Asterisk, we would send a 487 in response
to the original INVITE and a 200 OK for the CANCEL. If there were a network
hiccup which caused the 200 OK and the 487 to be lost, then the UA communicating
with Asterisk may try to retransmit its CANCEL. Asterisk's response to this used
to be to try sending another 487 to the canceled INVITE and another 200 OK to the
CANCEL.
The problem here is that the originally-sent 487 was sent "reliably" meaning that
it will be retransmitted until it is received properly. So when we receive the second
CANCEL it is likely that the first batch of 487s we sent is still going strong and
reaches the UA. The result was that the second set of 487s would be retransmitted
constantly until the maximum number of retries had been reached.
The fix for this is that if we receive a second CANCEL for an INVITE, then we cancel
the retransmission of the first set of 487s and start a second set. This causes the
dialog to be terminated reasonably.
(closes issue #14584)
Reported by: klaus3000
Patches:
14584_v2.patch uploaded by mmichelson (license 60)
Tested by: klaus3000
........
r202342 | mmichelson | 2009-06-22 09:44:58 -0500 (Mon, 22 Jun 2009) | 3 lines
Remove an extra debug line left from previous commit.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202343
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 22 Jun 2009 14:35:09 +0000 (14:35 +0000)]
Merged revisions 202336 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r202336 | mmichelson | 2009-06-22 09:34:05 -0500 (Mon, 22 Jun 2009) | 25 lines
Fix a possible infinite loop in SDP parsing during glare situation.
There was a while loop in get_ip_and_port_from_sdp which was controlled
by a call to get_sdp_iterate. The loop would exit either if what we were
searching for was found or if the return was NULL. The problem is that
get_sdp_iterate never returns NULL. This means that if what we were searching
for was not present, the loop would run infinitely. This modification of the
loop fixes the problem.
(closes issue #15213)
Reported by: schmidts
(closes issue #15349)
Reported by: samy
(closes issue #14464)
Reported by: pj
(closes issue #15345)
Reported by: aragon
Patches:
sip_inf_loop.patch uploaded by mmichelson (license 60)
Tested by: aragon
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202337
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 21 Jun 2009 16:36:55 +0000 (16:36 +0000)]
Note a bug in cdr_sqlite3_custom so I don't forget about it.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202301
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 21 Jun 2009 16:11:48 +0000 (16:11 +0000)]
Fix possibility of crashiness during reload in custom fields handling.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202262
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 21 Jun 2009 16:00:23 +0000 (16:00 +0000)]
Standardize return values of load_config() so reload() doesn't report an error on success.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202258
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 20 Jun 2009 20:56:13 +0000 (20:56 +0000)]
Leave a note about some unsafe code in cdr_manager
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202223
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Sat, 20 Jun 2009 19:09:47 +0000 (19:09 +0000)]
Fix version detection for API changes in spandsp.
(closes issue #15355)
Reported by: deuffy
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202183
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 20 Jun 2009 14:09:40 +0000 (14:09 +0000)]
Remove unnecessary usleep() from a couple of module unload callbacks.
In passing, also tweak cdr_unregister() to hold the list lock a bit less time.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202109
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Nicholson [Fri, 19 Jun 2009 21:25:06 +0000 (21:25 +0000)]
Use sched_yield() instead of usleep(1)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202039
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Nicholson [Fri, 19 Jun 2009 21:22:14 +0000 (21:22 +0000)]
Blocked revisions 202022 via svnmerge
........
r202022 | mnicholson | 2009-06-19 16:21:15 -0500 (Fri, 19 Jun 2009) | 4 lines
Added deadlock protection to try_suggested_sip_codec in chan_sip.c.
Review: https://reviewboard.asterisk.org/r/287/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@202026
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David Vossel [Fri, 19 Jun 2009 20:24:37 +0000 (20:24 +0000)]
Merged revisions 201993 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r201993 | dvossel | 2009-06-19 15:22:02 -0500 (Fri, 19 Jun 2009) | 8 lines
timestamp was being converted to host order as a short rather than a long
(closes issue #15361)
Reported by: ffloimair
Patches:
ts_issue.diff uploaded by dvossel (license 671)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201994
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Terry Wilson [Fri, 19 Jun 2009 17:40:16 +0000 (17:40 +0000)]
Add note about the addition of calendar support
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201944
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 19 Jun 2009 15:47:55 +0000 (15:47 +0000)]
Fix 2 typos and add support for wide character types.
Reported by Benny Amorsen via the asterisk-users mailing list.
http://lists.digium.com/pipermail/asterisk-users/2009-June/233622.html
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201904
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 19 Jun 2009 15:41:24 +0000 (15:41 +0000)]
Add support for allowing an RTP engine to decide on whether it is possible for specific formats to be transcoded for an RTP instance.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201902
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 19 Jun 2009 00:43:41 +0000 (00:43 +0000)]
Merged revisions 201828 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r201828 | tilghman | 2009-06-18 19:40:41 -0500 (Thu, 18 Jun 2009) | 6 lines
If the "h" extension fails, give it another chance in main/pbx.c.
If the "h" extension fails, give it another chance in main/pbx.c, when it
returns from the bridge code. Fixes an issue where the "h" extension may
occasionally not fire, when a Dial is executed from a Macro.
Debugged in #asterisk with user tompaw.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201829
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Thu, 18 Jun 2009 20:52:36 +0000 (20:52 +0000)]
One of the changes in 1.6.1 was to allow app_directory to use functionality
within app_voicemail for directory functions. It is therefore no longer
necessary for app_directory to be linked against the ODBC libraries (and it
never was necessary for app_directory to be linked against IMAP, though it
was).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201783
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Thu, 18 Jun 2009 18:24:23 +0000 (18:24 +0000)]
Clarify CUT code, and in the process, fix a bug in trunk only
(closes issue #15320)
Reported by: chappell
Patches:
cut_fix.patch uploaded by chappell (license 8)
cut_clarify.patch uploaded by chappell (license 8)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201745
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Nicholson [Thu, 18 Jun 2009 17:41:09 +0000 (17:41 +0000)]
Added deadlock protection to try_suggested_sip_codec in chan_sip.c.
Review: https://reviewboard.asterisk.org/r/285/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201717
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David Vossel [Thu, 18 Jun 2009 16:37:42 +0000 (16:37 +0000)]
fixes some memory leaks and redundant conditions
(closes issue #15269)
Reported by: contactmayankjain
Patches:
patch.txt uploaded by contactmayankjain (license 740)
memory_leak_stuff.trunk.diff uploaded by dvossel (license 671)
Tested by: contactmayankjain, dvossel
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201678
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 18 Jun 2009 15:27:10 +0000 (15:27 +0000)]
Merged revisions 201600 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r201600 | russell | 2009-06-18 10:24:31 -0500 (Thu, 18 Jun 2009) | 29 lines
Fix memory corruption and leakage related reloads of non files mode MoH classes.
For Music on Hold classes that are not files mode, meaning that we are executing
an application that will feed us audio data, we use a thread to monitor the
external application and read audio from it. This thread also makes use of the
MoH class object. In the MoH class destructor, we used pthread_cancel() to ask
the thread to exit. Unfortunately, the code did not wait to ensure that the
thread actually went away. What needed to be done is a pthread_join() to ensure
that the thread fully cleans up before we proceed. By adding this one line, we
resolve two significant problems:
1) Since the thread was never joined, it never fully goes away. So, on every
reload of non-files mode MoH, an unused thread was sticking around.
2) There was a race condition here where the application monitoring thread
could still try to access the MoH class, even though the thread executing
the MoH reload has already destroyed it.
(issue #15109)
Reported by: jvandal
(issue #15123)
Reported by: axisinternet
(issue #15195)
Reported by: amorsen
(issue AST-208)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201610
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 18 Jun 2009 15:20:17 +0000 (15:20 +0000)]
Trunk implementation of setting an alternate RTP source.
This contains the interface by which we can let an rtp instance know
that it might start receiving audio from a new source. This is similar
in nature to revision 197588 of Asterisk 1.4.
Review: https://reviewboard.asterisk.org/r/276
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201583
65c4cc65-6c06-0410-ace0-
fbb531ad65f3