diff options
author | Matthew Jordan <mjordan@digium.com> | 2014-05-18 20:38:02 +0000 |
---|---|---|
committer | Matthew Jordan <mjordan@digium.com> | 2014-05-18 20:38:02 +0000 |
commit | 17ff4d92823264e0db1902747d0b1ffcf5a7c26e (patch) | |
tree | d20c18838f54b00ce3458ffe874caddc76379ae9 /res/res_pjsip_session.c | |
parent | 4c252096ef90d79a0da69daedaf09898b47a675b (diff) |
bridge_native_rtp/bridge_channel: Fix direct media issues due to frame hook
This patch fixes issues with direct media bridges that occur after a blind
transfer. These issues were caught by the (currently failing)
pjsip/transfers/blind_transfer/caller_direct_media test.
The test currently fails primarily for two reasons:
(1) When Bob and Charlie (the transfer target and the transfer destination)
enter a bridge together, the framehook remains on the transfer target
channel until both channels are in the bridge. As it consumes voice frames,
the initial bridge type is a simple bridge. The framehook is removed when
both channels are in the bridge; however, this does not currently cause the
bridging framework to re-evaluate the bridge. This patch adds a
AST_SOFTHANGUP_UNBRIDGE poke to the transfer target channel when a
framehook is removed so the bridge can re-evaluate itself.
(2) When a channel leaves a native RTP bridge, it may be leaving due to being
hung up. Sending a re-INVITE to a channel that is about to be hung up is
not nice - in fact, there's a good chance we'll send the BYE request before
the channel has had a chance to send back a 200 OK. To be somewhat nicer,
this patch adds a function to channel.h that allows the bridging framework
to query for exactly why a channel is leaving a bridge via the channel's
soft hangup flags. This allows it to only send the re-INVITE if there's a
chance the channel will survive the native bridging experience.
Review: https://reviewboard.asterisk.org/r/3535/
........
Merged revisions 414122 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@414123 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_pjsip_session.c')
-rw-r--r-- | res/res_pjsip_session.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c index 6acbc0c6d..192ce2cc7 100644 --- a/res/res_pjsip_session.c +++ b/res/res_pjsip_session.c @@ -780,6 +780,9 @@ int ast_sip_session_refresh(struct ast_sip_session *session, 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; } |