Skip to content

[rtp_relay] keep the all-branches session across a failed branch #4292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
killdashnine wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −0
Open

[rtp_relay] keep the all-branches session across a failed branch #4292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions modules/rtp_relay/rtp_relay_ctx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1875,6 +1875,26 @@ static int rtp_relay_ctx_leg_reply(struct rtp_relay_ctx *ctx, struct sip_msg *ms
return ret;
}

/* a session engaged for all the branches also covers the ones the failure
* route may still create (digest retry, failover), so a failed branch must
* not destroy it: release the media of the failed attempt and forget its
* callee, and the next branch that is forwarded makes a fresh offer */
static void rtp_relay_sess_failed_branch(struct rtp_relay_ctx *ctx,
struct rtp_relay_sess *sess, struct sip_msg *rpl, struct sip_msg *req)
{
struct rtp_relay_session info;

if (!rtp_sess_late(sess)) {
memset(&info, 0, sizeof info);
info.msg = (rpl == FAKED_REPLY ? req : rpl);
rtp_relay_delete(&info, ctx, sess, RTP_RELAY_CALLEE);
rtp_sess_reset_ongoing(sess);
}
/* the tag belongs to the branch that failed */
if (sess->legs[RTP_RELAY_CALLEE])
shm_str_clean(&sess->legs[RTP_RELAY_CALLEE]->tag);
}

static void rtp_relay_ctx_initial_cb(struct cell* t, int type, struct tmcb_params *p)
{
struct rtp_relay_session info;
Expand Down Expand Up @@ -1902,6 +1922,11 @@ static void rtp_relay_ctx_initial_cb(struct cell* t, int type, struct tmcb_param
rtp_sess_disabled(sess), rtp_sess_pending(sess));
goto end;
}
if (type == TMCB_ON_FAILURE &&
sess->index == RTP_RELAY_ALL_BRANCHES) {
rtp_relay_sess_failed_branch(ctx, sess, p->rpl, p->req);
break;
}
rtp_relay_fill_sess_leg(ctx, sess, RTP_RELAY_CALLEE,
NULL, rtp_relay_ctx_branch());
switch (handle_rtp_relay_ctx_leg_reply(ctx, p->rpl, p->req, sess, RTP_RELAY_CALLEE)) {
Expand Down
Loading