bridge_native_rtp: Take the bridge type choice of both channels into account.
[asterisk/asterisk.git] / bridges / bridge_native_rtp.c
index 27d8d77..2be2dbf 100644 (file)
@@ -103,16 +103,29 @@ static enum ast_rtp_glue_result native_rtp_bridge_get(struct ast_channel *c0, st
                audio_glue1_res = AST_RTP_GLUE_RESULT_FORBID;
        }
 
-       /* If any sort of bridge is forbidden just completely bail out and go back to generic bridging */
-       if (audio_glue0_res == AST_RTP_GLUE_RESULT_FORBID
-               || audio_glue1_res == AST_RTP_GLUE_RESULT_FORBID) {
+       /* The order of preference is: forbid, local, and remote. */
+       if (audio_glue0_res == AST_RTP_GLUE_RESULT_FORBID ||
+               audio_glue1_res == AST_RTP_GLUE_RESULT_FORBID) {
+               /* If any sort of bridge is forbidden just completely bail out and go back to generic bridging */
                return AST_RTP_GLUE_RESULT_FORBID;
+       } else if (audio_glue0_res == AST_RTP_GLUE_RESULT_LOCAL ||
+               audio_glue1_res == AST_RTP_GLUE_RESULT_LOCAL) {
+               return AST_RTP_GLUE_RESULT_LOCAL;
+       } else {
+               return AST_RTP_GLUE_RESULT_REMOTE;
        }
-
-       return audio_glue0_res;
 }
 
-static int native_rtp_bridge_start(struct ast_bridge *bridge, struct ast_channel *target)
+/*!
+ * \internal
+ * \brief Start native RTP bridging of two channels
+ *
+ * \param bridge The bridge that had native RTP bridging happening on it
+ * \param target If remote RTP bridging, the channel that is unheld.
+ *
+ * \note Bridge must be locked when calling this function.
+ */
+static void native_rtp_bridge_start(struct ast_bridge *bridge, struct ast_channel *target)
 {
        struct ast_bridge_channel *c0 = AST_LIST_FIRST(&bridge->channels);
        struct ast_bridge_channel *c1 = AST_LIST_LAST(&bridge->channels);
@@ -128,18 +141,12 @@ static int native_rtp_bridge_start(struct ast_bridge *bridge, struct ast_channel
        RAII_VAR(struct ast_format_cap *, cap1, ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_NOLOCK), ast_format_cap_destroy);
 
        if (c0 == c1) {
-               return 0;
+               return;
        }
 
+       ast_channel_lock_both(c0->chan, c1->chan);
        native_type = native_rtp_bridge_get(c0->chan, c1->chan, &glue0, &glue1, &instance0, &instance1, &vinstance0, &vinstance1);
 
-       if (glue0->get_codec) {
-               glue0->get_codec(c0->chan, cap0);
-       }
-       if (glue1->get_codec) {
-               glue1->get_codec(c1->chan, cap1);
-       }
-
        switch (native_type) {
        case AST_RTP_GLUE_RESULT_LOCAL:
                if (ast_rtp_instance_get_engine(instance0)->local_bridge) {
@@ -155,6 +162,12 @@ static int native_rtp_bridge_start(struct ast_bridge *bridge, struct ast_channel
                break;
 
        case AST_RTP_GLUE_RESULT_REMOTE:
+               if (glue0->get_codec) {
+                       glue0->get_codec(c0->chan, cap0);
+               }
+               if (glue1->get_codec) {
+                       glue1->get_codec(c1->chan, cap1);
+               }
 
                /* If we have a target, it's the channel that received the UNHOLD or UPDATE_RTP_PEER frame and was told to resume */
                if (!target) {
@@ -180,7 +193,8 @@ static int native_rtp_bridge_start(struct ast_bridge *bridge, struct ast_channel
                break;
        }
 
-       return 0;
+       ast_channel_unlock(c0->chan);
+       ast_channel_unlock(c1->chan);
 }
 
 static void native_rtp_bridge_stop(struct ast_bridge *bridge, struct ast_channel *target)
@@ -202,6 +216,7 @@ static void native_rtp_bridge_stop(struct ast_bridge *bridge, struct ast_channel
                return;
        }
 
+       ast_channel_lock_both(c0->chan, c1->chan);
        native_type = native_rtp_bridge_get(c0->chan, c1->chan, &glue0, &glue1, &instance0, &instance1, &vinstance0, &vinstance1);
 
        switch (native_type) {
@@ -241,6 +256,9 @@ static void native_rtp_bridge_stop(struct ast_bridge *bridge, struct ast_channel
 
        ast_debug(2, "Discontinued RTP bridging of '%s' and '%s' - media will flow through Asterisk core\n",
                ast_channel_name(c0->chan), ast_channel_name(c1->chan));
+
+       ast_channel_unlock(c0->chan);
+       ast_channel_unlock(c1->chan);
 }
 
 /*! \brief Frame hook that is called to intercept hold/unhold */
@@ -252,25 +270,38 @@ static struct ast_frame *native_rtp_framehook(struct ast_channel *chan, struct a
                return f;
        }
 
-       ast_channel_lock(chan);
        bridge = ast_channel_get_bridge(chan);
-       ast_channel_unlock(chan);
 
        if (bridge) {
+               /* native_rtp_bridge_start/stop are not being called from bridging
+                  core so we need to lock the bridge prior to calling these functions
+                  Unfortunately that means unlocking the channel, but as it
+                  should not be modified this should be okay...hopefully */
+               ast_channel_unlock(chan);
+               ast_bridge_lock(bridge);
                if (f->subclass.integer == AST_CONTROL_HOLD) {
                        native_rtp_bridge_stop(bridge, chan);
                } else if ((f->subclass.integer == AST_CONTROL_UNHOLD) || (f->subclass.integer == AST_CONTROL_UPDATE_RTP_PEER)) {
                        native_rtp_bridge_start(bridge, chan);
                }
+               ast_bridge_unlock(bridge);
+               ast_channel_lock(chan);
+
        }
 
        return f;
 }
 
+/*! \brief Callback function which informs upstream if we are consuming a frame of a specific type */
+static int native_rtp_framehook_consume(void *data, enum ast_frame_type type)
+{
+       return (type == AST_FRAME_CONTROL ? 1 : 0);
+}
+
 /*! \brief Internal helper function which checks whether the channels are compatible with our native bridging */
 static int native_rtp_bridge_capable(struct ast_channel *chan)
 {
-       return !ast_channel_has_audio_frame_or_monitor(chan);
+       return !ast_channel_has_hook_requiring_audio(chan);
 }
 
 static int native_rtp_bridge_compatible(struct ast_bridge *bridge)
@@ -371,6 +402,7 @@ static int native_rtp_bridge_framehook_attach(struct ast_bridge_channel *bridge_
        static struct ast_framehook_interface hook = {
                .version = AST_FRAMEHOOK_INTERFACE_VERSION,
                .event_cb = native_rtp_framehook,
+               .consume_cb = native_rtp_framehook_consume,
        };
 
        if (!data) {
@@ -412,7 +444,8 @@ static int native_rtp_bridge_join(struct ast_bridge *bridge, struct ast_bridge_c
                return -1;
        }
 
-       return native_rtp_bridge_start(bridge, NULL);
+       native_rtp_bridge_start(bridge, NULL);
+       return 0;
 }
 
 static void native_rtp_bridge_unsuspend(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel)
@@ -430,9 +463,19 @@ static void native_rtp_bridge_leave(struct ast_bridge *bridge, struct ast_bridge
        native_rtp_bridge_framehook_detach(bridge_channel);
 
        glue = ast_rtp_instance_get_glue(ast_channel_tech(bridge_channel->chan)->type);
+       if (!glue) {
+               return;
+       }
+
        glue->get_rtp_info(bridge_channel->chan, &instance);
-       glue->get_vrtp_info ? glue->get_vrtp_info(bridge_channel->chan, &vinstance) : AST_RTP_GLUE_RESULT_FORBID;
-       glue->get_trtp_info ? glue->get_trtp_info(bridge_channel->chan, &tinstance) : AST_RTP_GLUE_RESULT_FORBID;
+
+       if (glue->get_vrtp_info) {
+               glue->get_vrtp_info(bridge_channel->chan, &vinstance);
+       }
+
+       if (glue->get_trtp_info) {
+               glue->get_trtp_info(bridge_channel->chan, &tinstance);
+       }
 
        /* Tear down P2P bridges */
        if (instance) {