Author: dlee Date: Mon Jul 29 13:27:55 2013 New Revision: 395700 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395700 Log: Multiple revisions 395378,395381,395400,395410,395430
........ r395378 | mjordan | 2013-07-24 23:06:32 -0500 (Wed, 24 Jul 2013) | 14 lines A great big renaming patch This patch renames the bridging* files to bridge*. This may seem pedantic and silly, but it fits better in line with current Asterisk naming conventions: * channel is not "channeling" * monitor is not "monitoring" etc. A bridge is an object. It is a first class citizen in Asterisk. "Bridging" is the act of using a bridge on a set of channels - and the API that fulfills that role is more than just the action. (closes issue ASTERISK-22130) ........ r395381 | mjordan | 2013-07-24 23:18:05 -0500 (Wed, 24 Jul 2013) | 1 line Fix incorrect reference to stasis/bridging.h ........ r395400 | mjordan | 2013-07-25 09:34:09 -0500 (Thu, 25 Jul 2013) | 4 lines Remove dead bridging code from features This removes the previously #if 0'd code. The functionality removed has either been subsumed by the Bridging API or is no longer applicable. ........ r395410 | mjordan | 2013-07-25 10:29:55 -0500 (Thu, 25 Jul 2013) | 5 lines Remove some dead parking call Since nothing is using these global parking functions, remove them! The first of many. ........ r395430 | rmudgett | 2013-07-25 13:27:10 -0500 (Thu, 25 Jul 2013) | 1 line Restore bridging files history. ........ Merged revisions 395378,395381,395400,395410,395430 from http://svn.asterisk.org/svn/asterisk/trunk Added: team/dlee/stasis-cache-split/include/asterisk/bridge.h - copied, changed from r395430, trunk/include/asterisk/bridge.h team/dlee/stasis-cache-split/include/asterisk/bridge_after.h - copied unchanged from r395430, trunk/include/asterisk/bridge_after.h team/dlee/stasis-cache-split/include/asterisk/bridge_basic.h - copied unchanged from r395430, trunk/include/asterisk/bridge_basic.h team/dlee/stasis-cache-split/include/asterisk/bridge_channel.h - copied unchanged from r395430, trunk/include/asterisk/bridge_channel.h team/dlee/stasis-cache-split/include/asterisk/bridge_channel_internal.h - copied unchanged from r395430, trunk/include/asterisk/bridge_channel_internal.h team/dlee/stasis-cache-split/include/asterisk/bridge_features.h - copied unchanged from r395430, trunk/include/asterisk/bridge_features.h team/dlee/stasis-cache-split/include/asterisk/bridge_internal.h - copied unchanged from r395430, trunk/include/asterisk/bridge_internal.h team/dlee/stasis-cache-split/include/asterisk/bridge_roles.h - copied unchanged from r395430, trunk/include/asterisk/bridge_roles.h team/dlee/stasis-cache-split/include/asterisk/bridge_technology.h - copied unchanged from r395430, trunk/include/asterisk/bridge_technology.h team/dlee/stasis-cache-split/include/asterisk/stasis_bridges.h - copied, changed from r395430, trunk/include/asterisk/stasis_bridges.h team/dlee/stasis-cache-split/main/bridge.c - copied, changed from r395430, trunk/main/bridge.c team/dlee/stasis-cache-split/main/bridge_after.c - copied unchanged from r395430, trunk/main/bridge_after.c team/dlee/stasis-cache-split/main/bridge_basic.c - copied unchanged from r395430, trunk/main/bridge_basic.c team/dlee/stasis-cache-split/main/bridge_channel.c - copied unchanged from r395430, trunk/main/bridge_channel.c team/dlee/stasis-cache-split/main/bridge_roles.c - copied unchanged from r395430, trunk/main/bridge_roles.c team/dlee/stasis-cache-split/main/manager_bridges.c - copied, changed from r395430, trunk/main/manager_bridges.c team/dlee/stasis-cache-split/main/stasis_bridges.c - copied, changed from r395430, trunk/main/stasis_bridges.c Removed: team/dlee/stasis-cache-split/include/asterisk/bridging.h team/dlee/stasis-cache-split/include/asterisk/bridging_after.h team/dlee/stasis-cache-split/include/asterisk/bridging_basic.h team/dlee/stasis-cache-split/include/asterisk/bridging_channel.h team/dlee/stasis-cache-split/include/asterisk/bridging_channel_internal.h team/dlee/stasis-cache-split/include/asterisk/bridging_features.h team/dlee/stasis-cache-split/include/asterisk/bridging_internal.h team/dlee/stasis-cache-split/include/asterisk/bridging_roles.h team/dlee/stasis-cache-split/include/asterisk/bridging_technology.h team/dlee/stasis-cache-split/include/asterisk/stasis_bridging.h team/dlee/stasis-cache-split/main/bridging.c team/dlee/stasis-cache-split/main/bridging_after.c team/dlee/stasis-cache-split/main/bridging_basic.c team/dlee/stasis-cache-split/main/bridging_channel.c team/dlee/stasis-cache-split/main/bridging_roles.c team/dlee/stasis-cache-split/main/manager_bridging.c team/dlee/stasis-cache-split/main/stasis_bridging.c Modified: team/dlee/stasis-cache-split/ (props changed) team/dlee/stasis-cache-split/apps/app_agent_pool.c team/dlee/stasis-cache-split/apps/app_bridgewait.c team/dlee/stasis-cache-split/apps/app_confbridge.c team/dlee/stasis-cache-split/apps/app_dial.c team/dlee/stasis-cache-split/apps/app_dumpchan.c team/dlee/stasis-cache-split/apps/app_queue.c team/dlee/stasis-cache-split/apps/confbridge/conf_chan_announce.c team/dlee/stasis-cache-split/apps/confbridge/conf_chan_record.c team/dlee/stasis-cache-split/apps/confbridge/conf_config_parser.c team/dlee/stasis-cache-split/apps/confbridge/confbridge_manager.c team/dlee/stasis-cache-split/apps/confbridge/include/confbridge.h team/dlee/stasis-cache-split/bridges/bridge_builtin_features.c team/dlee/stasis-cache-split/bridges/bridge_builtin_interval_features.c team/dlee/stasis-cache-split/bridges/bridge_holding.c team/dlee/stasis-cache-split/bridges/bridge_native_rtp.c team/dlee/stasis-cache-split/bridges/bridge_simple.c team/dlee/stasis-cache-split/bridges/bridge_softmix.c team/dlee/stasis-cache-split/channels/chan_bridge_media.c team/dlee/stasis-cache-split/channels/chan_dahdi.c team/dlee/stasis-cache-split/channels/chan_iax2.c team/dlee/stasis-cache-split/channels/chan_mgcp.c team/dlee/stasis-cache-split/channels/chan_misdn.c team/dlee/stasis-cache-split/channels/chan_sip.c team/dlee/stasis-cache-split/channels/chan_skinny.c team/dlee/stasis-cache-split/channels/chan_unistim.c team/dlee/stasis-cache-split/channels/dahdi/bridge_native_dahdi.c team/dlee/stasis-cache-split/channels/sig_analog.c team/dlee/stasis-cache-split/channels/sig_pri.c team/dlee/stasis-cache-split/funcs/func_channel.c team/dlee/stasis-cache-split/include/asterisk/core_unreal.h team/dlee/stasis-cache-split/include/asterisk/doxygen/architecture.h team/dlee/stasis-cache-split/include/asterisk/features.h team/dlee/stasis-cache-split/main/cdr.c team/dlee/stasis-cache-split/main/cel.c team/dlee/stasis-cache-split/main/channel.c team/dlee/stasis-cache-split/main/cli.c team/dlee/stasis-cache-split/main/core_local.c team/dlee/stasis-cache-split/main/core_unreal.c team/dlee/stasis-cache-split/main/features.c team/dlee/stasis-cache-split/main/manager.c team/dlee/stasis-cache-split/main/mixmonitor.c team/dlee/stasis-cache-split/main/parking.c team/dlee/stasis-cache-split/main/stasis_channels.c team/dlee/stasis-cache-split/res/parking/parking_applications.c team/dlee/stasis-cache-split/res/parking/parking_bridge.c team/dlee/stasis-cache-split/res/parking/parking_bridge_features.c team/dlee/stasis-cache-split/res/parking/parking_controller.c team/dlee/stasis-cache-split/res/parking/parking_manager.c team/dlee/stasis-cache-split/res/parking/res_parking.h team/dlee/stasis-cache-split/res/res_sip_refer.c team/dlee/stasis-cache-split/res/res_stasis.c team/dlee/stasis-cache-split/res/res_stasis_bridge_add.c team/dlee/stasis-cache-split/res/stasis/control.c team/dlee/stasis-cache-split/res/stasis_http/resource_bridges.c team/dlee/stasis-cache-split/res/stasis_http/resource_channels.c team/dlee/stasis-cache-split/tests/test_cdr.c team/dlee/stasis-cache-split/tests/test_cel.c Propchange: team/dlee/stasis-cache-split/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Mon Jul 29 13:27:55 2013 @@ -1,1 +1,1 @@ -/trunk:1-395367 +/trunk:1-395430 Modified: team/dlee/stasis-cache-split/apps/app_agent_pool.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/apps/app_agent_pool.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/apps/app_agent_pool.c (original) +++ team/dlee/stasis-cache-split/apps/app_agent_pool.c Mon Jul 29 13:27:55 2013 @@ -40,10 +40,10 @@ #include "asterisk/pbx.h" #include "asterisk/module.h" #include "asterisk/channel.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_internal.h" -#include "asterisk/bridging_basic.h" -#include "asterisk/bridging_after.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_internal.h" +#include "asterisk/bridge_basic.h" +#include "asterisk/bridge_after.h" #include "asterisk/config_options.h" #include "asterisk/features_config.h" #include "asterisk/astobj2.h" @@ -1403,7 +1403,7 @@ return bridge; } -static void bridging_init_agent_hold(void) +static void bridge_init_agent_hold(void) { /* Setup bridge agent_hold subclass v_table. */ bridge_agent_hold_v_table = ast_bridge_base_v_table; @@ -2556,7 +2556,7 @@ } /* Init agent holding bridge v_table. */ - bridging_init_agent_hold(); + bridge_init_agent_hold(); /* Setup to provide Agent:agent-id device state. */ res |= ast_devstate_prov_add("Agent", agent_pvt_devstate_get); Modified: team/dlee/stasis-cache-split/apps/app_bridgewait.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/apps/app_bridgewait.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/apps/app_bridgewait.c (original) +++ team/dlee/stasis-cache-split/apps/app_bridgewait.c Mon Jul 29 13:27:55 2013 @@ -45,7 +45,7 @@ #include "asterisk/lock.h" #include "asterisk/utils.h" #include "asterisk/app.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/musiconhold.h" /*** DOCUMENTATION Modified: team/dlee/stasis-cache-split/apps/app_confbridge.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/apps/app_confbridge.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/apps/app_confbridge.c (original) +++ team/dlee/stasis-cache-split/apps/app_confbridge.c Mon Jul 29 13:27:55 2013 @@ -32,7 +32,7 @@ * \addtogroup configuration_file Configuration Files */ -/*! +/*! * \page confbridge.conf confbridge.conf * \verbinclude confbridge.conf.sample */ @@ -58,7 +58,7 @@ #include "asterisk/pbx.h" #include "asterisk/module.h" #include "asterisk/lock.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/musiconhold.h" #include "asterisk/say.h" #include "asterisk/audiohook.h" @@ -68,7 +68,7 @@ #include "asterisk/manager.h" #include "asterisk/test.h" #include "asterisk/stasis.h" -#include "asterisk/stasis_bridging.h" +#include "asterisk/stasis_bridges.h" #include "asterisk/json.h" /*** DOCUMENTATION @@ -128,13 +128,13 @@ </syntax> <description> <para>---- Example 1 ----</para> - <para>In this example the custom set user profile on this channel will automatically be used by the ConfBridge app.</para> + <para>In this example the custom set user profile on this channel will automatically be used by the ConfBridge app.</para> <para>exten => 1,1,Answer() </para> <para>exten => 1,n,Set(CONFBRIDGE(user,announce_join_leave)=yes)</para> <para>exten => 1,n,Set(CONFBRIDGE(user,startmuted)=yes)</para> <para>exten => 1,n,ConfBridge(1) </para> <para>---- Example 2 ----</para> - <para>This example shows how to use a predefined user or bridge profile in confbridge.conf as a template for a dynamic profile. Here we make a admin/marked user out of the default_user profile that is already defined in confbridge.conf.</para> + <para>This example shows how to use a predefined user or bridge profile in confbridge.conf as a template for a dynamic profile. Here we make a admin/marked user out of the default_user profile that is already defined in confbridge.conf.</para> <para>exten => 1,1,Answer() </para> <para>exten => 1,n,Set(CONFBRIDGE(user,template)=default_user)</para> <para>exten => 1,n,Set(CONFBRIDGE(user,admin)=yes)</para> @@ -155,7 +155,7 @@ </parameter> </syntax> <description> - <para>This function returns a non-negative integer for valid conference identifiers (0 or 1 for <literal>locked</literal>) and "" for invalid conference identifiers.</para> + <para>This function returns a non-negative integer for valid conference identifiers (0 or 1 for <literal>locked</literal>) and "" for invalid conference identifiers.</para> </description> </function> <manager name="ConfbridgeList" language="en_US"> @@ -2240,7 +2240,7 @@ " Lists all currently active conference bridges or a specific conference bridge.\n" "\n" " When a conference bridge name is provided, flags may be shown for users. Below\n" - " are the flags and what they represent.\n" + " are the flags and what they represent.\n" "\n" " Flags:\n" " A - The user is an admin\n" @@ -2710,7 +2710,7 @@ conference->name, conference->activeusers + conference->waitingusers, conference->markedusers, - conference->locked ? "Yes" : "No"); + conference->locked ? "Yes" : "No"); ao2_unlock(conference); ao2_ref(conference, -1); @@ -3147,8 +3147,8 @@ * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) Modified: team/dlee/stasis-cache-split/apps/app_dial.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/apps/app_dial.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/apps/app_dial.c (original) +++ team/dlee/stasis-cache-split/apps/app_dial.c Mon Jul 29 13:27:55 2013 @@ -66,8 +66,7 @@ #include "asterisk/framehook.h" #include "asterisk/dial.h" #include "asterisk/stasis_channels.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_after.h" +#include "asterisk/bridge_after.h" #include "asterisk/features_config.h" /*** DOCUMENTATION Modified: team/dlee/stasis-cache-split/apps/app_dumpchan.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/apps/app_dumpchan.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/apps/app_dumpchan.c (original) +++ team/dlee/stasis-cache-split/apps/app_dumpchan.c Mon Jul 29 13:27:55 2013 @@ -41,7 +41,7 @@ #include "asterisk/channel.h" #include "asterisk/app.h" #include "asterisk/translate.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" /*** DOCUMENTATION <application name="DumpChan" language="en_US"> @@ -139,10 +139,10 @@ S_OR(ast_channel_dialed(c)->number.str, "(N/A)"), S_COR(ast_channel_redirecting(c)->from.number.valid, ast_channel_redirecting(c)->from.number.str, "(N/A)"), ast_channel_parkinglot(c), - ast_channel_language(c), + ast_channel_language(c), ast_state2str(ast_channel_state(c)), ast_channel_state(c), - ast_channel_rings(c), + ast_channel_rings(c), ast_getformatname_multiple(nf, sizeof(nf), ast_channel_nativeformats(c)), ast_getformatname(ast_channel_writeformat(c)), ast_getformatname(ast_channel_readformat(c)), Modified: team/dlee/stasis-cache-split/apps/app_queue.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/apps/app_queue.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/apps/app_queue.c (original) +++ team/dlee/stasis-cache-split/apps/app_queue.c Mon Jul 29 13:27:55 2013 @@ -108,8 +108,7 @@ #include "asterisk/dial.h" #include "asterisk/stasis_channels.h" #include "asterisk/stasis_message_router.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_after.h" +#include "asterisk/bridge_after.h" /* Define, to debug reference counts on queues, without debugging reference counts on queue members */ /* #define REF_DEBUG_ONLY_QUEUES */ Modified: team/dlee/stasis-cache-split/apps/confbridge/conf_chan_announce.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/apps/confbridge/conf_chan_announce.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/apps/confbridge/conf_chan_announce.c (original) +++ team/dlee/stasis-cache-split/apps/confbridge/conf_chan_announce.c Mon Jul 29 13:27:55 2013 @@ -32,7 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/core_unreal.h" #include "include/confbridge.h" Modified: team/dlee/stasis-cache-split/apps/confbridge/conf_chan_record.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/apps/confbridge/conf_chan_record.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/apps/confbridge/conf_chan_record.c (original) +++ team/dlee/stasis-cache-split/apps/confbridge/conf_chan_record.c Mon Jul 29 13:27:55 2013 @@ -32,7 +32,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "include/confbridge.h" /* ------------------------------------------------------------------- */ Modified: team/dlee/stasis-cache-split/apps/confbridge/conf_config_parser.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/apps/confbridge/conf_config_parser.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/apps/confbridge/conf_config_parser.c (original) +++ team/dlee/stasis-cache-split/apps/confbridge/conf_config_parser.c Mon Jul 29 13:27:55 2013 @@ -36,7 +36,7 @@ #include "include/confbridge.h" #include "asterisk/astobj2.h" #include "asterisk/cli.h" -#include "asterisk/bridging_features.h" +#include "asterisk/bridge_features.h" #include "asterisk/stringfields.h" #include "asterisk/pbx.h" Modified: team/dlee/stasis-cache-split/apps/confbridge/confbridge_manager.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/apps/confbridge/confbridge_manager.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/apps/confbridge/confbridge_manager.c (original) +++ team/dlee/stasis-cache-split/apps/confbridge/confbridge_manager.c Mon Jul 29 13:27:55 2013 @@ -28,10 +28,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/stasis.h" #include "asterisk/stasis_channels.h" -#include "asterisk/stasis_bridging.h" +#include "asterisk/stasis_bridges.h" #include "asterisk/manager.h" #include "asterisk/stasis_message_router.h" #include "include/confbridge.h" Modified: team/dlee/stasis-cache-split/apps/confbridge/include/confbridge.h URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/apps/confbridge/include/confbridge.h?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/apps/confbridge/include/confbridge.h (original) +++ team/dlee/stasis-cache-split/apps/confbridge/include/confbridge.h Mon Jul 29 13:27:55 2013 @@ -26,8 +26,8 @@ #include "asterisk/logger.h" #include "asterisk/linkedlists.h" #include "asterisk/channel.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_features.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_features.h" #include "conf_state.h" /* Maximum length of a conference bridge name */ Modified: team/dlee/stasis-cache-split/bridges/bridge_builtin_features.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/bridges/bridge_builtin_features.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/bridges/bridge_builtin_features.c (original) +++ team/dlee/stasis-cache-split/bridges/bridge_builtin_features.c Mon Jul 29 13:27:55 2013 @@ -41,8 +41,8 @@ #include "asterisk/module.h" #include "asterisk/channel.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_technology.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_technology.h" #include "asterisk/frame.h" #include "asterisk/file.h" #include "asterisk/app.h" Modified: team/dlee/stasis-cache-split/bridges/bridge_builtin_interval_features.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/bridges/bridge_builtin_interval_features.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/bridges/bridge_builtin_interval_features.c (original) +++ team/dlee/stasis-cache-split/bridges/bridge_builtin_interval_features.c Mon Jul 29 13:27:55 2013 @@ -40,7 +40,7 @@ #include "asterisk/module.h" #include "asterisk/channel.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/file.h" #include "asterisk/app.h" #include "asterisk/astobj2.h" Modified: team/dlee/stasis-cache-split/bridges/bridge_holding.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/bridges/bridge_holding.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/bridges/bridge_holding.c (original) +++ team/dlee/stasis-cache-split/bridges/bridge_holding.c Mon Jul 29 13:27:55 2013 @@ -44,8 +44,8 @@ #include "asterisk/module.h" #include "asterisk/channel.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_technology.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_technology.h" #include "asterisk/frame.h" #include "asterisk/musiconhold.h" Modified: team/dlee/stasis-cache-split/bridges/bridge_native_rtp.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/bridges/bridge_native_rtp.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/bridges/bridge_native_rtp.c (original) +++ team/dlee/stasis-cache-split/bridges/bridge_native_rtp.c Mon Jul 29 13:27:55 2013 @@ -41,8 +41,8 @@ #include "asterisk/module.h" #include "asterisk/channel.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_technology.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_technology.h" #include "asterisk/frame.h" #include "asterisk/rtp_engine.h" Modified: team/dlee/stasis-cache-split/bridges/bridge_simple.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/bridges/bridge_simple.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/bridges/bridge_simple.c (original) +++ team/dlee/stasis-cache-split/bridges/bridge_simple.c Mon Jul 29 13:27:55 2013 @@ -41,8 +41,8 @@ #include "asterisk/module.h" #include "asterisk/channel.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_technology.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_technology.h" #include "asterisk/frame.h" static int simple_bridge_join(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel) Modified: team/dlee/stasis-cache-split/bridges/bridge_softmix.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/bridges/bridge_softmix.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/bridges/bridge_softmix.c (original) +++ team/dlee/stasis-cache-split/bridges/bridge_softmix.c Mon Jul 29 13:27:55 2013 @@ -45,8 +45,8 @@ #include "asterisk/module.h" #include "asterisk/channel.h" -#include "asterisk/bridging.h" -#include "asterisk/bridging_technology.h" +#include "asterisk/bridge.h" +#include "asterisk/bridge_technology.h" #include "asterisk/frame.h" #include "asterisk/options.h" #include "asterisk/logger.h" Modified: team/dlee/stasis-cache-split/channels/chan_bridge_media.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/channels/chan_bridge_media.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/channels/chan_bridge_media.c (original) +++ team/dlee/stasis-cache-split/channels/chan_bridge_media.c Mon Jul 29 13:27:55 2013 @@ -37,7 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/channel.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/core_unreal.h" #include "asterisk/module.h" Modified: team/dlee/stasis-cache-split/channels/chan_dahdi.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/channels/chan_dahdi.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/channels/chan_dahdi.c (original) +++ team/dlee/stasis-cache-split/channels/chan_dahdi.c Mon Jul 29 13:27:55 2013 @@ -124,7 +124,7 @@ #include "asterisk/ccss.h" #include "asterisk/data.h" #include "asterisk/features_config.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/stasis_channels.h" #include "chan_dahdi.h" #include "dahdi/bridge_native_dahdi.h" @@ -506,7 +506,7 @@ static int dtmfcid_level = 256; #define REPORT_CHANNEL_ALARMS 1 -#define REPORT_SPAN_ALARMS 2 +#define REPORT_SPAN_ALARMS 2 static int report_alarms = REPORT_CHANNEL_ALARMS; #ifdef HAVE_PRI @@ -1705,14 +1705,14 @@ #endif /* linear_mode = 0 - turn linear mode off, >0 - turn linear mode on -* returns the last value of the linear setting -*/ +* returns the last value of the linear setting +*/ static int my_set_linear_mode(void *pvt, enum analog_sub sub, int linear_mode) { struct dahdi_pvt *p = pvt; int oldval; int idx = analogsub_to_dahdisub(sub); - + dahdi_setlinear(p->subs[idx].dfd, linear_mode); oldval = p->subs[idx].linear; p->subs[idx].linear = linear_mode ? 1 : 0; @@ -4516,7 +4516,7 @@ float neg; float shallow, steep; float max = SHRT_MAX; - + neg = (sample < 0 ? -1 : 1); steep = drc*sample; shallow = neg*(max-max/drc)+(float)sample/drc; @@ -4974,7 +4974,7 @@ set_actual_gain(p->subs[SUB_REAL].dfd, 0, 0, p->rxdrc, p->txdrc, p->law); } else { set_actual_gain(p->subs[SUB_REAL].dfd, p->rxgain, p->txgain, p->rxdrc, p->txdrc, p->law); - } + } #ifdef HAVE_PRI if (dahdi_sig_pri_lib_handles(p->sig)) { @@ -8239,7 +8239,7 @@ /* if the call is already accepted and we already delivered AST_CONTROL_RINGING * now enqueue a progress frame to bridge the media up */ if (p->mfcr2_call_accepted && - !p->mfcr2_progress_sent && + !p->mfcr2_progress_sent && ast_channel_state(ast) == AST_STATE_RINGING) { ast_debug(1, "Enqueuing progress frame after R2 accept in chan %d\n", p->channel); ast_queue_frame(p->owner, &fr); @@ -11060,7 +11060,7 @@ pfds[count].events = POLLPRI; pfds[count].revents = 0; /* Message waiting or r2 channels also get watched for reading */ - if (i->cidspill || i->mwisendactive || i->mwimonitor_fsk || + if (i->cidspill || i->mwisendactive || i->mwimonitor_fsk || (i->cid_start == CID_START_DTMF_NOALERT && (i->sig == SIG_FXSLS || i->sig == SIG_FXSGS || i->sig == SIG_FXSKS))) { pfds[count].events |= POLLIN; } @@ -11213,7 +11213,7 @@ int energy; struct timeval now; /* State machine dtmfcid_holdoff_state allows for the line to settle - * before checking agin for dtmf energy. Presently waits for 500 mS before checking again + * before checking agin for dtmf energy. Presently waits for 500 mS before checking again */ if (1 == i->dtmfcid_holdoff_state) { gettimeofday(&i->dtmfcid_delay, NULL); @@ -11231,7 +11231,7 @@ ast_mutex_unlock(&iflock); if (dahdi_analog_lib_handles(i->sig, i->radio, i->oprmode)) { /* just in case this event changes or somehow destroys a channel, set doomed here too */ - doomed = analog_handle_init_event(i->sig_pvt, ANALOG_EVENT_DTMFCID); + doomed = analog_handle_init_event(i->sig_pvt, ANALOG_EVENT_DTMFCID); i->dtmfcid_holdoff_state = 1; } else { struct ast_callid *callid = NULL; @@ -11492,9 +11492,9 @@ struct dahdi_mfcr2 *new_r2link = NULL; struct dahdi_mfcr2 **new_r2links = NULL; - /* Only create a new R2 link if + /* Only create a new R2 link if 1. This is the first link requested - 2. Configuration changed + 2. Configuration changed 3. We got more channels than supported per link */ if (!r2links_count || memcmp(&conf->mfcr2, &r2links[r2links_count - 1]->conf, sizeof(conf->mfcr2)) || @@ -16563,13 +16563,13 @@ for (; ;) { /* Scans the string for the next value in the pattern. If none, it checks to see if any have been entered so far. */ - if(!sscanf(v->value, "%30d", &norval) && count_pattern == 0) { + if(!sscanf(v->value, "%30d", &norval) && count_pattern == 0) { ast_log(LOG_ERROR, "busypattern= expects either busypattern=tonelength,quietlength or busypattern=t1length, q1length, t2length, q2length at line %d.\n", v->lineno); break; } - busy_cadence->pattern[count_pattern] = norval; - + busy_cadence->pattern[count_pattern] = norval; + count_pattern++; if (count_pattern == 4) { break; @@ -16583,11 +16583,11 @@ } busy_cadence->length = count_pattern; - if (count_pattern % 2 != 0) { + if (count_pattern % 2 != 0) { /* The pattern length must be divisible by two */ ast_log(LOG_ERROR, "busypattern= expects either busypattern=tonelength,quietlength or busypattern=t1length, q1length, t2length, q2length at line %d.\n", v->lineno); } - + } static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct ast_variable *v, int reload, int options) @@ -17245,7 +17245,7 @@ #if defined(HAVE_PRI_SERVICE_MESSAGES) } else if (!strcasecmp(v->name, "service_message_support")) { /* assuming switchtype for this channel group has been configured already */ - if ((confp->pri.pri.switchtype == PRI_SWITCH_ATT4ESS + if ((confp->pri.pri.switchtype == PRI_SWITCH_ATT4ESS || confp->pri.pri.switchtype == PRI_SWITCH_LUCENT5E || confp->pri.pri.switchtype == PRI_SWITCH_NI2) && ast_true(v->value)) { confp->pri.pri.enable_service_message_support = 1; @@ -17756,7 +17756,7 @@ for (tmp = iflist, y=-1; tmp; tmp = tmp->next) { if (!tmp->destroy && tmp->span != y) { tmp->manages_span_alarms = 1; - y = tmp->span; + y = tmp->span; } else { tmp->manages_span_alarms = 0; } @@ -18291,8 +18291,8 @@ * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) Modified: team/dlee/stasis-cache-split/channels/chan_iax2.c URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-cache-split/channels/chan_iax2.c?view=diff&rev=395700&r1=395699&r2=395700 ============================================================================== --- team/dlee/stasis-cache-split/channels/chan_iax2.c (original) +++ team/dlee/stasis-cache-split/channels/chan_iax2.c Mon Jul 29 13:27:55 2013 @@ -27,7 +27,7 @@ * \arg \ref Config_iax * * \ingroup channel_drivers - * + * * \todo Implement musicclass settings for IAX2 devices */ @@ -67,7 +67,7 @@ #include "asterisk/paths.h" #include "asterisk/lock.h" -#include "asterisk/frame.h" +#include "asterisk/frame.h" #include "asterisk/channel.h" #include "asterisk/module.h" #include "asterisk/pbx.h" @@ -102,7 +102,7 @@ #include "asterisk/netsock2.h" #include "asterisk/security_events.h" #include "asterisk/stasis_endpoints.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "asterisk/stasis.h" #include "asterisk/stasis_system.h" @@ -793,7 +793,7 @@ ast_aes_decrypt_key mydcx; /*! Decryption AES-128 Key used to decrypt peer frames */ ast_aes_decrypt_key dcx; - /*! scheduler id associated with iax_key_rotate + /*! scheduler id associated with iax_key_rotate * for encrypted calls*/ int keyrotateid; /*! 32 bytes of semi-random data */ @@ -1032,12 +1032,12 @@ #endif #ifdef DEBUG_SCHED_MULTITHREAD char curfunc[80]; -#endif +#endif int actions; pthread_t threadid; int threadnum; struct sockaddr_in iosin; - unsigned char readbuf[4096]; + unsigned char readbuf[4096]; unsigned char *buf; ssize_t buf_len; size_t buf_size; @@ -1137,8 +1137,8 @@ /*! * * \brief Another container of iax2_pvt structures - * - * Active IAX2 pvt stucts used during transfering a call are stored here. + * + * Active IAX2 pvt stucts used during transfering a call are stored here. */ static struct ao2_container *iax_transfercallno_pvts; @@ -1152,7 +1152,7 @@ static void iax_outputframe(struct iax_frame *f, struct ast_iax2_full_hdr *fhi, int rx, struct sockaddr_in *sin, int datalen) { if (iaxdebug || - (sin && debugaddr.sin_addr.s_addr && + (sin && debugaddr.sin_addr.s_addr && (!ntohs(debugaddr.sin_port) || debugaddr.sin_port == sin->sin_port) && debugaddr.sin_addr.s_addr == sin->sin_addr.s_addr)) { @@ -1837,7 +1837,7 @@ * \note This funtion calls realtime_peer -> reg_source_db -> iax2_poke_peer -> find_callno, * so do not call it with a pvt lock held. */ -static struct iax2_peer *find_peer(const char *name, int realtime) +static struct iax2_peer *find_peer(const char *name, int realtime) { struct iax2_peer *peer = NULL; @@ -2073,7 +2073,7 @@ tmp = NULL; return NULL; } - + tmp->prefs = prefs; tmp->pingid = -1; tmp->lagid = -1; @@ -2199,9 +2199,9 @@ iaxs[callno] = NULL; /* Update the two timers that should have been started */ - iaxs[x]->pingid = iax2_sched_add(sched, + iaxs[x]->pingid = iax2_sched_add(sched, ping_time * 1000, send_ping, (void *)(long)x); - iaxs[x]->lagid = iax2_sched_add(sched, + iaxs[x]->lagid = iax2_sched_add(sched, lagrq_time * 1000, send_lagrq, (void *)(long)x); if (locked) @@ -2306,7 +2306,7 @@ return 0; } -/*! +/*! * \internal * * \brief compares sin to calltoken_ignores table to determine if validation is required. @@ -2360,12 +2360,12 @@ return res; } -/*! +/*! * \internal * * \brief set peercnt callno limit. * - * \details + * \details * First looks in custom definitions. If not found, global limit * is used. Entries marked as reg already have * a custom limit set by a registration and are not modified. @@ -2392,7 +2392,7 @@ peercnt->limit = limit; } -/*! +/*! * \internal * \brief sets limits for all peercnts in table. done on reload to reflect changes in conf. */ @@ -2406,9 +2406,9 @@ return 0; } -/*! +/*! * \internal - * \brief returns match if delme is set. + * \brief returns match if delme is set. */ static int prune_addr_range_cb(void *obj, void *arg, int flags) { @@ -2417,7 +2417,7 @@ return addr_range->delme ? CMP_MATCH : 0; } -/*! +/*! * \internal * \brief modifies peercnt entry in peercnts table. Used to set custom limit or mark a registered ip */ @@ -2446,7 +2446,7 @@ } } -/*! +/*! * \internal * \brief adds an ip to the peercnts table, increments connection count if it already exists * @@ -2502,7 +2502,7 @@ return res; } -/*! +/*! * \internal * \brief decrements a peercnts table entry */ @@ -2528,7 +2528,7 @@ ao2_unlock(peercnts); } -/*! +/*! * \internal * \brief called by scheduler to decrement object */ @@ -2542,7 +2542,7 @@ return 0; } -/*! +/*! * \internal * \brief decrements peercnts connection count, finds by addr */ @@ -2560,7 +2560,7 @@ return 0; } -/*! +/*! * \internal * \brief Create callno_limit entry based on configuration */ @@ -2615,7 +2615,7 @@ } } -/*! +/*! * \internal * \brief Create calltoken_ignores entry based on configuration */ @@ -2901,9 +2901,9 @@ CALLNO_ENTRY_TO_PTR(entry)); } -/*! +/*! * \internal - * \brief returns whether or not a frame is capable of starting a new IAX2 dialog. + * \brief returns whether or not a frame is capable of starting a new IAX2 dialog. * * \note For this implementation, inbound pokes should _NOT_ be capable of allocating * a new callno. @@ -2952,7 +2952,7 @@ }; memcpy(&tmp_pvt.addr, sin, sizeof(tmp_pvt.addr)); - /* this works for finding normal call numbers not involving transfering */ + /* this works for finding normal call numbers not involving transfering */ if ((pvt = ao2_find(iax_peercallno_pvts, &tmp_pvt, OBJ_POINTER))) { if (return_locked) { ast_mutex_lock(&iaxsl[pvt->callno]); @@ -3058,7 +3058,7 @@ return res; } -static int find_callno(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int new, int sockfd, int full_frame) { +static int find_callno(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int new, int sockfd, int full_frame) { return __find_callno(callno, dcallno, sin, new, sockfd, 0, full_frame); } @@ -3161,7 +3161,7 @@ * * \note IMPORTANT NOTE!!! Any time this function is used, even if iaxs[callno] * was valid before calling it, it may no longer be valid after calling it. - * This function calls iax2_queue_frame(), which may unlock and lock the mutex [... 4204 lines stripped ...] -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
