Author: rmudgett
Date: Sat Jun 8 01:31:50 2013
New Revision: 390991
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=390991
Log:
Add more support for native bridging.
* Added a start technology callback that technologies can use to start
bridging operations. It is expected that native bridges will find this
useful.
* Factored out bridge_channel_complete_join().
Modified:
trunk/include/asterisk/bridging_technology.h
trunk/main/bridging.c
Modified: trunk/include/asterisk/bridging_technology.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/bridging_technology.h?view=diff&rev=390991&r1=390990&r2=390991
==============================================================================
--- trunk/include/asterisk/bridging_technology.h (original)
+++ trunk/include/asterisk/bridging_technology.h Sat Jun 8 01:31:50 2013
@@ -63,6 +63,16 @@
*/
int (*create)(struct ast_bridge *bridge);
/*!
+ * \brief Request a bridge technology instance start operations.
+ *
+ * \retval 0 on success
+ * \retval -1 on failure
+ *
+ * \note On entry, bridge may or may not already be locked.
+ * However, it can be accessed as if it were locked.
+ */
+ int (*start)(struct ast_bridge *bridge);
+ /*!
* \brief Request a bridge technology instance stop in preparation for being destroyed.
*
* \note On entry, bridge is already locked.
@@ -106,6 +116,9 @@
*
* \retval 0 if not compatible
* \retval non-zero if compatible
+ *
+ * \note On entry, bridge may or may not already be locked.
+ * However, it can be accessed as if it were locked.
*/
int (*compatible)(struct ast_bridge *bridge);
/*!
Modified: trunk/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridging.c?view=diff&rev=390991&r1=390990&r2=390991
==============================================================================
--- trunk/main/bridging.c (original)
+++ trunk/main/bridging.c Sat Jun 8 01:31:50 2013
@@ -1095,6 +1095,39 @@
/*!
* \internal
+ * \brief Complete joining a channel to the bridge.
+ * \since 12.0.0
+ *
+ * \param bridge What to operate upon.
+ * \param bridge_channel What is joining the bridge technology.
+ *
+ * \note On entry, bridge is already locked.
+ *
+ * \return Nothing
+ */
+static void bridge_channel_complete_join(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel)
+{
+ /* Make the channel compatible with the bridge */
+ bridge_make_compatible(bridge, bridge_channel);
+
+ /* Tell the bridge technology we are joining so they set us up */
+ ast_debug(1, "Bridge %s: %p(%s) is joining %s technology\n",
+ bridge->uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan),
+ bridge->technology->name);
+ if (bridge->technology->join
+ && bridge->technology->join(bridge, bridge_channel)) {
+ ast_debug(1, "Bridge %s: %p(%s) failed to join %s technology\n",
+ bridge->uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan),
+ bridge->technology->name);
+ bridge_channel->just_joined = 1;
+ return;
+ }
+
+ bridge_channel->just_joined = 0;
+}
+
+/*!
+ * \internal
* \brief Complete joining new channels to the bridge.
* \since 12.0.0
*
@@ -1123,22 +1156,7 @@
if (!bridge_channel->just_joined) {
continue;
}
-
- /* Make the channel compatible with the bridge */
- bridge_make_compatible(bridge, bridge_channel);
-
- /* Tell the bridge technology we are joining so they set us up */
- ast_debug(1, "Bridge %s: %p(%s) is joining %s technology\n",
- bridge->uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan),
- bridge->technology->name);
- if (bridge->technology->join
- && bridge->technology->join(bridge, bridge_channel)) {
- ast_debug(1, "Bridge %s: %p(%s) failed to join %s technology\n",
- bridge->uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan),
- bridge->technology->name);
- }
-
- bridge_channel->just_joined = 0;
+ bridge_channel_complete_join(bridge, bridge_channel);
}
}
@@ -1414,6 +1432,14 @@
ao2_ref(self, -1);
return NULL;
}
+ ast_debug(1, "Bridge %s: calling %s technology start\n",
+ self->uniqueid, self->technology->name);
+ if (self->technology->start && self->technology->start(self)) {
+ ast_debug(1, "Bridge %s: failed to start %s technology\n",
+ self->uniqueid, self->technology->name);
+ ao2_ref(self, -1);
+ return NULL;
+ }
if (!ast_bridge_topic(self)) {
ao2_ref(self, -1);
@@ -1756,36 +1782,30 @@
old_technology->stop(&dummy_bridge);
}
- /* Move existing channels over to the new technology. */
+ /*
+ * Move existing channels over to the new technology and
+ * complete joining any new channels to the bridge.
+ */
AST_LIST_TRAVERSE(&bridge->channels, bridge_channel, entry) {
- if (bridge_channel->just_joined) {
- /*
- * This channel has not completed joining the bridge so it is
- * not in the old bridge technology.
- */
- continue;
- }
-
- /* First we part them from the old technology */
- ast_debug(1, "Bridge %s: %p(%s) is leaving %s technology (dummy)\n",
- dummy_bridge.uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan),
- old_technology->name);
- if (old_technology->leave) {
- old_technology->leave(&dummy_bridge, bridge_channel);
- }
-
- /* Second we make them compatible again with the bridge */
- bridge_make_compatible(bridge, bridge_channel);
-
- /* Third we join them to the new technology */
- ast_debug(1, "Bridge %s: %p(%s) is joining %s technology\n",
- bridge->uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan),
- new_technology->name);
- if (new_technology->join && new_technology->join(bridge, bridge_channel)) {
- ast_debug(1, "Bridge %s: %p(%s) failed to join %s technology\n",
- bridge->uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan),
- new_technology->name);
- }
+ if (!bridge_channel->just_joined) {
+ /* Take existing channel from the old technology. */
+ ast_debug(1, "Bridge %s: %p(%s) is leaving %s technology (dummy)\n",
+ dummy_bridge.uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan),
+ old_technology->name);
+ if (old_technology->leave) {
+ old_technology->leave(&dummy_bridge, bridge_channel);
+ }
+ }
+
+ /* Add any new channels or re-add an existing channel to the bridge. */
+ bridge_channel_complete_join(bridge, bridge_channel);
+ }
+
+ ast_debug(1, "Bridge %s: calling %s technology start\n",
+ bridge->uniqueid, new_technology->name);
+ if (new_technology->start && new_technology->start(bridge)) {
+ ast_log(LOG_WARNING, "Bridge %s: failed to start bridge technology %s\n",
+ bridge->uniqueid, new_technology->name);
}
/*