[asterisk-commits] rmudgett: trunk r396792 - in /trunk: apps/confbridge/ include/asterisk/ main/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Aug 15 13:20:54 CDT 2013
Author: rmudgett
Date: Thu Aug 15 13:20:52 2013
New Revision: 396792
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=396792
Log:
Changed some BUGBUG tags to associated JIRA issue tags.
Modified:
trunk/apps/confbridge/conf_config_parser.c
trunk/include/asterisk/bridge_channel.h
trunk/main/bridge.c
trunk/main/bridge_channel.c
trunk/main/config_options.c
Modified: trunk/apps/confbridge/conf_config_parser.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/confbridge/conf_config_parser.c?view=diff&rev=396792&r1=396791&r2=396792
==============================================================================
--- trunk/apps/confbridge/conf_config_parser.c (original)
+++ trunk/apps/confbridge/conf_config_parser.c Thu Aug 15 13:20:52 2013
@@ -1922,7 +1922,7 @@
/* This option should only be used with the CONFBRIDGE dialplan function */
aco_option_register_custom(&cfg_info, "template", ACO_EXACT, user_types, NULL, user_template_handler, 0);
-/* BUGBUG need a user supplied bridge merge_priority to merge ConfBridges (default = 1, range 1-INT_MAX) */
+/* XXX ASTERISK-21271 need a user supplied bridge merge_priority to merge ConfBridges (default = 1, range 1-INT_MAX) */
/* Bridge options */
aco_option_register(&cfg_info, "type", ACO_EXACT, bridge_types, NULL, OPT_NOOP_T, 0, 0);
aco_option_register(&cfg_info, "jitterbuffer", ACO_EXACT, bridge_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct bridge_profile, flags), USER_OPT_JITTERBUFFER);
Modified: trunk/include/asterisk/bridge_channel.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/bridge_channel.h?view=diff&rev=396792&r1=396791&r2=396792
==============================================================================
--- trunk/include/asterisk/bridge_channel.h (original)
+++ trunk/include/asterisk/bridge_channel.h Thu Aug 15 13:20:52 2013
@@ -81,7 +81,7 @@
* \brief Structure that contains information regarding a channel in a bridge
*/
struct ast_bridge_channel {
-/* BUGBUG cond is only here because of external party suspend/unsuspend support. */
+/* XXX ASTERISK-21271 cond is only here because of external party suspend/unsuspend support. */
/*! Condition, used if we want to wake up a thread waiting on the bridged channel */
ast_cond_t cond;
/*! Current bridged channel state */
Modified: trunk/main/bridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridge.c?view=diff&rev=396792&r1=396791&r2=396792
==============================================================================
--- trunk/main/bridge.c (original)
+++ trunk/main/bridge.c Thu Aug 15 13:20:52 2013
@@ -1421,7 +1421,7 @@
}
/*
- * BUGBUG make ast_bridge_join() require features to be allocated just like ast_bridge_impart() and not expect the struct back.
+ * XXX ASTERISK-21271 make ast_bridge_join() require features to be allocated just like ast_bridge_impart() and not expect the struct back.
*
* This change is really going to break ConfBridge. All other
* users are easily changed. However, it is needed so the
@@ -1449,7 +1449,7 @@
res = -1;
goto join_exit;
}
-/* BUGBUG features cannot be NULL when passed in. When it is changed to allocated we can do like ast_bridge_impart() and allocate one. */
+/* XXX ASTERISK-21271 features cannot be NULL when passed in. When it is changed to allocated we can do like ast_bridge_impart() and allocate one. */
ast_assert(features != NULL);
if (!features) {
ao2_ref(bridge_channel, -1);
@@ -2638,9 +2638,9 @@
int ast_bridge_suspend(struct ast_bridge *bridge, struct ast_channel *chan)
{
struct ast_bridge_channel *bridge_channel;
-/* BUGBUG the case of a disolved bridge while channel is suspended is not handled. */
-/* BUGBUG suspend/unsuspend needs to be rethought. The caller must block until it has successfully suspended the channel for temporary control. */
-/* BUGBUG external suspend/unsuspend needs to be eliminated. The channel may be playing a file at the time and stealing it then is not good. */
+/* XXX ASTERISK-21271 the case of a disolved bridge while channel is suspended is not handled. */
+/* XXX ASTERISK-21271 suspend/unsuspend needs to be rethought. The caller must block until it has successfully suspended the channel for temporary control. */
+/* XXX ASTERISK-21271 external suspend/unsuspend needs to be eliminated. The channel may be playing a file at the time and stealing it then is not good. */
ast_bridge_lock(bridge);
@@ -2659,7 +2659,7 @@
int ast_bridge_unsuspend(struct ast_bridge *bridge, struct ast_channel *chan)
{
struct ast_bridge_channel *bridge_channel;
-/* BUGBUG the case of a disolved bridge while channel is suspended is not handled. */
+/* XXX ASTERISK-21271 the case of a disolved bridge while channel is suspended is not handled. */
ast_bridge_lock(bridge);
@@ -3181,7 +3181,7 @@
return cmp;
}
-/* BUGBUG make ast_bridge_features_init() static when make ast_bridge_join() requires features to be allocated. */
+/* XXX ASTERISK-21271 make ast_bridge_features_init() static when make ast_bridge_join() requires features to be allocated. */
int ast_bridge_features_init(struct ast_bridge_features *features)
{
/* Zero out the structure */
@@ -3213,7 +3213,7 @@
return 0;
}
-/* BUGBUG make ast_bridge_features_cleanup() static when make ast_bridge_join() requires features to be allocated. */
+/* XXX ASTERISK-21271 make ast_bridge_features_cleanup() static when make ast_bridge_join() requires features to be allocated. */
void ast_bridge_features_cleanup(struct ast_bridge_features *features)
{
struct ast_bridge_hook_timer *hook;
Modified: trunk/main/bridge_channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridge_channel.c?view=diff&rev=396792&r1=396791&r2=396792
==============================================================================
--- trunk/main/bridge_channel.c (original)
+++ trunk/main/bridge_channel.c Thu Aug 15 13:20:52 2013
@@ -1749,7 +1749,7 @@
ast_bridge_channel_lock(bridge_channel);
if (bridge_channel->state != BRIDGE_CHANNEL_STATE_WAIT) {
} else if (bridge_channel->suspended) {
-/* BUGBUG the external party use of suspended will go away as will these references because this is the bridge channel thread */
+/* XXX ASTERISK-21271 the external party use of suspended will go away as will these references because this is the bridge channel thread */
ast_debug(1, "Bridge %s: %p(%s) is going into a signal wait\n",
bridge_channel->bridge->uniqueid, bridge_channel,
ast_channel_name(bridge_channel->chan));
Modified: trunk/main/config_options.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/config_options.c?view=diff&rev=396792&r1=396791&r2=396792
==============================================================================
--- trunk/main/config_options.c (original)
+++ trunk/main/config_options.c Thu Aug 15 13:20:52 2013
@@ -599,7 +599,7 @@
}
/*
- * BUGBUG must fix config framework loading of multiple files.
+ * XXX ASTERISK-22009 must fix config framework loading of multiple files.
*
* A reload with multiple files must reload all files if any
* file has been touched.
More information about the asterisk-commits
mailing list