summaryrefslogtreecommitdiff
path: root/apps/app_confbridge.c
AgeCommit message (Collapse)Author
2012-03-13Finalize ast_channel opaquificationTerry Wilson
Review: https://reviewboard.asterisk.org/r/1786/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-03-10Transition app_page to using app_confbridge internally for the conference ↵Joshua Colp
bridge portion of paging. This also adds a new 'announcement' option to ConfBridge user profiles. Review: https://reviewboard.asterisk.org/r/1754/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358730 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-02-29Opaquify ast_channel structs and listsTerry Wilson
Review: https://reviewboard.asterisk.org/r/1773/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@357542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-02-24Opaquification for ast_format structs in struct ast_channelTerry Wilson
Review: https://reviewboard.asterisk.org/r/1770/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-02-20ast_channel opaquification of pointers and integral typesTerry Wilson
Review: https://reviewboard.asterisk.org/r/1753/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356042 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-02-13Opaquify char * and char[] in ast_channelTerry Wilson
Review: https://reviewboard.asterisk.org/r/1733/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@354968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-02-13Don't try to play sound files that do not exist.Joshua Colp
(closes issue ASTERISK-19188) Reported by: slesru ........ Merged revisions 354938 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@354939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-02-01Constify some more channel driver technology callback parameters.Richard Mudgett
Review: https://reviewboard.asterisk.org/r/1707/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353685 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-01-24Opaquify channel stringfieldsTerry Wilson
Continue channel opaque-ification by wrapping all of the stringfields. Eventually, we will restrict what can actually set these variables, but the purpose for now is to hide the implementation and keep people from adding code that directly accesses the channel structure. Semantic changes will follow afterward. Review: https://reviewboard.asterisk.org/r/1661/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@352348 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-01-13Fix crash from bridge channel hangup race condition in ConfBridgeMatthew Jordan
This patch addresses two issues in ConfBridge and the channel bridge layer: 1. It fixes a race condition wherein the bridge channel could be hung up 2. It removes the deadlock avoidance from the bridging layer and makes the bridge_pvt an ao2 ref counted object Patch by David Vossel (mjordan was merely the commit monkey) (issue ASTERISK-18988) (closes issue ASTERISK-18885) Reported by: Dmitry Melekhov Tested by: Matt Jordan Patches: chan_bridge_cleanup_v.diff uploaded by David Vossel (license 5628) (closes issue ASTERISK-19100) Reported by: Matt Jordan Tested by: Matt Jordan Review: https://reviewboard.asterisk.org/r/1654/ ........ Merged revisions 350550 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@350551 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2012-01-09Replace direct access to channel name with accessor functionsTerry Wilson
There are many benefits to making the ast_channel an opaque handle, from increasing maintainability to presenting ways to kill masquerades. This patch kicks things off by taking things a field at a time, renaming the field to '__do_not_use_${fieldname}' and then writing setters/getters and converting the existing code to using them. When all fields are done, we can move ast_channel to a C file from channel.h and lop off the '__do_not_use_'. This patch sets up main/channel_interal_api.c to be the only file that actually accesses the ast_channel's fields directly. The intent would be for any API functions in channel.c to use the accessor functions. No more monkeying around with channel internals. We should use our own APIs. The interesting changes in this patch are the addition of channel_internal_api.c, the moving of the AST_DATA stuff from channel.c to channel_internal_api.c (note: the AST_DATA stuff will have to be reworked to use accessor functions when ast_channel is really opaque), and some re-working of the way channel iterators/callbacks are handled so as to avoid creating fake ast_channels on the stack to pass in matching data by directly accessing fields (since "name" is a stringfield and the fake channel doesn't init the stringfields, you can't use the ast_channel_name_set() function). I went with ast_channel_name(chan) for a getter, and ast_channel_name_set(chan, name) for a setter. The majority of the grunt-work for this change was done by writing a semantic patch using Coccinelle ( http://coccinelle.lip6.fr/ ). Review: https://reviewboard.asterisk.org/r/1655/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@350223 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-12-22Add Asterisk TestSuite event hooks to support ConfBridge testingMatthew Jordan
This patch adds initial testsuite event hooks so that ConfBridge tests can be executed in the Asterisk TestSuite. (issue ASTERISK-19059) ........ Merged revisions 348846 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@348848 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-12-14Improve error message in CONFBRIDGE_INFOMatthew Jordan
Provided a more descriptive error message when a value supplied for the parameter type is not one of the acceptable values. (closes issue ASTERISK-18717) Reported by: Paul Belanger Patches: __20111103-better-confbridge_info-error-msg.txt (License #4999) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@348160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-11-17Add admin toggle mute all and participant count menu options to app_confbridgeMatthew Jordan
This patch adds two new menu features to app_confbridge, admin_toggle_menu_ participants and participant_count. The admin action will globally mute / unmute all non-admin participants on a converence, while the participant count simply exposes the existing participant count function to the conference bridge menu. This also adds configuration options to change the sound played when the conference is globally muted / unmuted, as well as the necessary config hooks to place these functions in the DTMF menus. (closes issue ASTERISK-18204) Reported by: Kevin Reeves Tested by: Matt Jordan Patches: app_confbridge.c.patch.txt, conf_config_parser.c.patch.txt, confbridge.h.patch.txt uploaded by Kevin Reeves (license 6281) Review: https://reviewboard.asterisk.org/r/1518/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@345560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-20Merged revisions 337120 via svnmerge from Matthew Jordan
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r337120 | mjordan | 2011-09-20 17:49:36 -0500 (Tue, 20 Sep 2011) | 28 lines Merged revisions 337118 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r337118 | mjordan | 2011-09-20 17:38:54 -0500 (Tue, 20 Sep 2011) | 21 lines Fix for incorrect voicemail duration in external notifications This patch fixes an issue where the voicemail duration was being reported with a duration significantly less than the actual sound file duration. Voicemails that contained mostly silence were reporting the duration of only the sound in the file, as opposed to the duration of the file with the silence. This patch fixes this by having two durations reported in the __ast_play_and_record family of functions - the sound_duration and the actual duration of the file. The sound_duration, which is optional, now reports the duration of the sound in the file, while the actual full duration of the file is reported in the duration parameter. This allows the voicemail applications to use the sound_duration for minimum duration checking, while reporting the full duration to external parties if the voicemail is kept. (issue ASTERISK-2234) (closes issue ASTERISK-16981) Reported by: Mary Ciuciu, Byron Clark, Brad House, Karsten Wemheuer, KevinH Tested by: Matt Jordan Review: https://reviewboard.asterisk.org/r/1443 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337124 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-19Merged revisions 332654 via svnmerge from Kinsey Moore
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r332654 | kmoore | 2011-08-19 14:59:34 -0500 (Fri, 19 Aug 2011) | 8 lines Make CONFBRIDGE_INFO behave more nicely CONFBRIDGE_INFO doesn't behave as well in edge cases as MEETME_INFO. With this patch, CONFBRIDGE_INFO should behave in a much more reasonable manner when presented with invalid conferences and keywords. Review: https://reviewboard.asterisk.org/r/1359/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332655 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-29Merged revisions 330162 via svnmerge from Paul Belanger
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r330162 | pabelanger | 2011-07-29 01:25:18 -0400 (Fri, 29 Jul 2011) | 4 lines Fix typo pointed out on #asterisk Thanks notten ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-28Merged revisions 329950 via svnmerge from Sean Bright
https://origsvn.digium.com/svn/asterisk/branches/10 ........ r329950 | seanbright | 2011-07-28 08:43:55 -0400 (Thu, 28 Jul 2011) | 1 line Correct the spelling of 'conference.' ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-14Merged revisions 328247 via svnmerge from Leif Madsen
https://origsvn.digium.com/svn/asterisk/branches/1.10 ................ r328247 | lmadsen | 2011-07-14 16:25:31 -0400 (Thu, 14 Jul 2011) | 14 lines Merged revisions 328209 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r328209 | lmadsen | 2011-07-14 16:13:06 -0400 (Thu, 14 Jul 2011) | 6 lines Introduce <support_level> tags in MODULEINFO. This change introduces MODULEINFO into many modules in Asterisk in order to show the community support level for those modules. This is used by changes committed to menuselect by Russell Bryant recently (r917 in menuselect). More information about the support level types and what they mean is available on the wiki at https://wiki.asterisk.org/wiki/display/AST/Asterisk+Module+Support+States ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@328259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-12Segfault on shutdown when confbridge is activeKinsey Moore
When undergoing a shutdown and channels are kicked out of a bridge, a segfault occurs because ConfBridge tries to play sounds on the bridge after the underlying channels have been blown away due to the shutdown. (closes ASTERISK-18040) Review: https://reviewboard.asterisk.org/r/1283/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@327748 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-07Updates confbridge.conf video documentation and adds dtmf action for ↵David Vossel
releasing video src. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@326782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-30Video support for ConfBridge.David Vossel
Review: https://reviewboard.asterisk.org/r/1288/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@325931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-23ConfBridge: redundant code cleanupKinsey Moore
There is no reason to clean up features twice. Review: https://reviewboard.asterisk.org/r/1279/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-21Fixes issue with channel write format being incorrectly restored when MOH is ↵David Vossel
used in confbridge. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324422 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-21ConfBridge does not handle hangup properlyKinsey Moore
When playing back a prompt to a channel, confbridge neglects to check for hangup events causing lockup condititions for hangups that occur before actually joining the conference. This change ensures that the user is removed from the conference in the event of a premature hangup. Review: https://reviewboard.asterisk.org/r/1277/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-15CONFBRIDGE_INFO function to get conference dataKinsey Moore
Added the CONFBRIDGE_INFO dialplan function to get information about a conference bridge including locked status and number of parties, admins, and marked users. Review: https://reviewboard.asterisk.org/r/1271/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-13MOH for only user not working with ConfBridgeKinsey Moore
This adds the playing_moh flag to the conference_bridge_user struct that signifies when MOH should be playing so code doesn't have to guess whether MOH is playing. This change also adds the necessary checking to ensure that MOH continues playing for a single user in a conference after the join sound is played when configured to do so. (closes ASTERISK-17988) Review: https://reviewboard.asterisk.org/r/1263/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323107 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-13ConfBridge: Use of bridge or user profiles that don't existKinsey Moore
Bridge and user profiles are not checked for existence before use. The lack of a fully formed bridge profile can cause a segfault when sounds are accessed. This change ensures that bridge and user profiles exist prior to usage attempts. Review: https://reviewboard.asterisk.org/r/1264/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323106 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-27Makes the new ConfBridge join and leave sounds be used by default rather ↵David Vossel
than beep and beeperr. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@315856 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-21New HD ConfBridge conferencing application.David Vossel
Includes a new highly optimized and customizable ConfBridge application capable of mixing audio at sample rates ranging from 8khz-192khz. Review: https://reviewboard.asterisk.org/r/1147/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@314598 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-03Asterisk media architecture conversion - no more format bitfieldsDavid Vossel
This patch is the foundation of an entire new way of looking at media in Asterisk. The code present in this patch is everything required to complete phase1 of my Media Architecture proposal. For more information about this project visit the link below. https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal The primary function of this patch is to convert all the usages of format bitfields in Asterisk to use the new format and format_cap APIs. Functionally no change in behavior should be present in this patch. Thanks to twilson and russell for all the time they spent reviewing these changes. Review: https://reviewboard.asterisk.org/r/1083/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-01Add's two features to confbridge: confbridge kick, and confbridge list.Brett Bryant
(closes issue #14389) (closes issue #18007) Reported by: jcollie Patches: 0001-Fix-up-bridging-module-so-that-menuselect-works.patch uploaded by jcollie (license 412) 0002-Add-confbridge-list-and-confbridge-kick-CLI-comm.patch uploaded by jcollie (license 412) Tested by: file Review: https://reviewboard.asterisk.org/r/1084/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@305433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-20Add load priority order, such that preload becomes unnecessary in most casesTilghman Lesher
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278132 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-29This patch adds custom device state handling for ConfBridge conferences,Jared Smith
matching the devstate handling of the MeetMe conferences. Review: https://reviewboard.asterisk.org/r/572/ Closes issue #16972 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@255281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-02Fix several XML documentation validate errors.Leif Madsen
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@249892 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-29Fix options 'm' and 's'. They were swapped in the code. Also document the ↵Matthew Nicholson
fact that app_confbridge does not automatically answer the channel. (closes issue #15964) Reported by: shrift git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@220904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-26Merge the new Channel Event Logging (CEL) subsystem.Russell Bryant
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
2009-06-07Global var cleanup - constification and removing unused vars.Russell Bryant
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@199479 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-21Const-ify the world (or at least a good part of it)Kevin P. Fleming
This patch adds 'const' tags to a number of Asterisk APIs where they are appropriate (where the API already demanded that the function argument not be modified, but the compiler was not informed of that fact). The list includes: - CLI command handlers - CLI command handler arguments - AGI command handlers - AGI command handler arguments - Dialplan application handler arguments - Speech engine API function arguments In addition, various file-scope and function-scope constant arrays got 'const' and/or 'static' qualifiers where they were missing. Review: https://reviewboard.asterisk.org/r/251/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@196072 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-12add 'const' qualifiers in various places where they should have beenKevin P. Fleming
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@193832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-11Don't play the "you are about to be placed into the conference" and "the ↵Joshua Colp
leader has left the conference" sounds if the quiet option is enabled. (reported by Vadim Lebedev on the asterisk-dev list) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@181210 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-05Merge phase 1 support for the new bridging architecture.Joshua Colp
This commit brings in the bridging core, bridging technologies, and the ConfBridge application. For usage information on the ConfBridge application please see the output of "core show application ConfBridge" from the CLI. For API documentation please see the doxygen page describing the architecture and the documentation for each API call. Review: http://reviewboard.digium.com/r/93/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@180369 65c4cc65-6c06-0410-ace0-fbb531ad65f3