[svn-commits] mjordan: branch 12 r414137 - in /branches/12: bridges/ include/asterisk/ main...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sun May 18 20:09:43 CDT 2014
Author: mjordan
Date: Sun May 18 20:09:39 2014
New Revision: 414137
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=414137
Log:
Undo r414122
The Test Suite caught a few problems, undoing until those are resolved
Modified:
branches/12/bridges/bridge_native_rtp.c
branches/12/include/asterisk/channel.h
branches/12/main/bridge_channel.c
branches/12/main/channel.c
branches/12/main/framehook.c
branches/12/res/res_pjsip_refer.c
branches/12/res/res_pjsip_session.c
Modified: branches/12/bridges/bridge_native_rtp.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/bridges/bridge_native_rtp.c?view=diff&rev=414137&r1=414136&r2=414137
==============================================================================
--- branches/12/bridges/bridge_native_rtp.c (original)
+++ branches/12/bridges/bridge_native_rtp.c Sun May 18 20:09:39 2014
@@ -230,10 +230,8 @@
break;
case AST_RTP_GLUE_RESULT_REMOTE:
if (!target) {
- if (ast_channel_is_leaving_bridge(c0->chan)) {
- glue0->update_peer(c0->chan, NULL, NULL, NULL, NULL, 0);
- }
- if (glue1 && ast_channel_is_leaving_bridge(c1->chan)) {
+ glue0->update_peer(c0->chan, NULL, NULL, NULL, NULL, 0);
+ if (glue1) {
glue1->update_peer(c1->chan, NULL, NULL, NULL, NULL, 0);
}
} else {
@@ -487,9 +485,8 @@
}
/* Direct RTP may have occurred, tear it down */
- if (ast_channel_is_leaving_bridge(bridge_channel->chan)) {
- glue->update_peer(bridge_channel->chan, NULL, NULL, NULL, NULL, 0);
- }
+ glue->update_peer(bridge_channel->chan, NULL, NULL, NULL, NULL, 0);
+
native_rtp_bridge_stop(bridge, NULL);
}
Modified: branches/12/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/branches/12/include/asterisk/channel.h?view=diff&rev=414137&r1=414136&r2=414137
==============================================================================
--- branches/12/include/asterisk/channel.h (original)
+++ branches/12/include/asterisk/channel.h Sun May 18 20:09:39 2014
@@ -4284,22 +4284,6 @@
int ast_channel_is_bridged(const struct ast_channel *chan);
/*!
- * \brief Determine if a channel is leaving a bridge, but \em not hung up
- * \since 12.3.0
- *
- * \param chan The channel to test
- *
- * \note If a channel is hung up, it is implicitly leaving any bridge it
- * may be in. This function is used to test if a channel is leaving a bridge
- * but may survive the experience, if it has a place to go to (dialplan or
- * otherwise)
- *
- * \retval 0 The channel is not leaving the bridge or is hung up
- * \retval non-zero The channel is leaving the bridge
- */
-int ast_channel_is_leaving_bridge(struct ast_channel *chan);
-
-/*!
* \brief Get the channel's bridge peer only if the bridge is two-party.
* \since 12.0.0
*
Modified: branches/12/main/bridge_channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/bridge_channel.c?view=diff&rev=414137&r1=414136&r2=414137
==============================================================================
--- branches/12/main/bridge_channel.c (original)
+++ branches/12/main/bridge_channel.c Sun May 18 20:09:39 2014
@@ -1756,9 +1756,9 @@
/* If we are not going to be hung up after leaving a bridge, and we were an
* outgoing channel, clear the outgoing flag.
*/
- if (ast_test_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_OUTGOING) &&
- (ast_channel_is_leaving_bridge(bridge_channel->chan) ||
- bridge_channel->state == BRIDGE_CHANNEL_STATE_WAIT)) {
+ if (ast_test_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_OUTGOING)
+ && (ast_channel_softhangup_internal_flag(bridge_channel->chan) & (AST_SOFTHANGUP_ASYNCGOTO | AST_SOFTHANGUP_UNBRIDGE)
+ || bridge_channel->state == BRIDGE_CHANNEL_STATE_WAIT)) {
ast_debug(2, "Channel %s will survive this bridge; clearing outgoing (dialed) flag\n", ast_channel_name(bridge_channel->chan));
ast_clear_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_OUTGOING);
}
Modified: branches/12/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/channel.c?view=diff&rev=414137&r1=414136&r2=414137
==============================================================================
--- branches/12/main/channel.c (original)
+++ branches/12/main/channel.c Sun May 18 20:09:39 2014
@@ -10151,18 +10151,6 @@
return ast_channel_internal_bridge(chan) != NULL;
}
-int ast_channel_is_leaving_bridge(struct ast_channel *chan)
-{
- int flags = ast_channel_softhangup_internal_flag(chan);
-
- /* We test the flags independently here in case they are masked with
- * actual "hangup" soft-hangup flags
- */
- return (flags == AST_SOFTHANGUP_ASYNCGOTO ||
- flags == AST_SOFTHANGUP_UNBRIDGE ||
- flags == (AST_SOFTHANGUP_ASYNCGOTO | AST_SOFTHANGUP_UNBRIDGE));
-}
-
struct ast_channel *ast_channel_bridge_peer(struct ast_channel *chan)
{
struct ast_channel *peer;
Modified: branches/12/main/framehook.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/framehook.c?view=diff&rev=414137&r1=414136&r2=414137
==============================================================================
--- branches/12/main/framehook.c (original)
+++ branches/12/main/framehook.c Sun May 18 20:09:39 2014
@@ -189,10 +189,6 @@
}
AST_LIST_TRAVERSE_SAFE_END;
- if (ast_channel_is_bridged(chan)) {
- ast_softhangup_nolock(chan, AST_SOFTHANGUP_UNBRIDGE);
- }
-
return res;
}
Modified: branches/12/res/res_pjsip_refer.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_pjsip_refer.c?view=diff&rev=414137&r1=414136&r2=414137
==============================================================================
--- branches/12/res/res_pjsip_refer.c (original)
+++ branches/12/res/res_pjsip_refer.c Sun May 18 20:09:39 2014
@@ -191,7 +191,7 @@
/* Media is passing without progress, this means the call has been answered */
notification = refer_progress_notification_alloc(progress, 200, PJSIP_EVSUB_STATE_TERMINATED);
} else if (f->frametype == AST_FRAME_CONTROL) {
-
+ ast_debug(5, "@@@@ GOT FRAME TYPE: %d\n", f->subclass.integer);
/* Based on the control frame being written we can send a NOTIFY advising of the progress */
if ((f->subclass.integer == AST_CONTROL_RING) || (f->subclass.integer == AST_CONTROL_RINGING)) {
progress->subclass = f->subclass.integer;
Modified: branches/12/res/res_pjsip_session.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_pjsip_session.c?view=diff&rev=414137&r1=414136&r2=414137
==============================================================================
--- branches/12/res/res_pjsip_session.c (original)
+++ branches/12/res/res_pjsip_session.c Sun May 18 20:09:39 2014
@@ -780,9 +780,6 @@
return -1;
}
}
- ast_debug(3, "Sending session refresh SDP via %s to %s\n",
- method == AST_SIP_SESSION_REFRESH_METHOD_INVITE ? "re-INVITE" : "UPDATE",
- ast_sorcery_object_get_id(session->endpoint));
ast_sip_session_send_request_with_cb(session, tdata, on_response);
return 0;
}
More information about the svn-commits
mailing list