diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-05-03 10:29:38 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-05-03 10:29:38 -0500 |
| commit | e538fc8e86bece8b562cc678ab2c4bcf3978d8e6 (patch) | |
| tree | ca26676035cf016dfc8771a90d76550b441dccd8 | |
| parent | 706b8993581968455b2de1f67676378c99d71510 (diff) | |
| parent | afdca5c68c6354ada43f341666d0cc9e14bf9fee (diff) | |
Merge "res_rtp_asterisk: Always update SRTP on local SSRC change."
| -rw-r--r-- | res/res_rtp_asterisk.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index 4ac20d551..5579914af 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -3947,15 +3947,15 @@ static void ast_rtp_change_source(struct ast_rtp_instance *instance) if (rtp->lastts) { /* We simply set this bit so that the next packet sent will have the marker bit turned on */ ast_set_flag(rtp, FLAG_NEED_MARKER_BIT); + } - ast_debug(3, "Changing ssrc from %u to %u due to a source change\n", rtp->ssrc, ssrc); + ast_debug(3, "Changing ssrc from %u to %u due to a source change\n", rtp->ssrc, ssrc); - if (srtp) { - ast_debug(3, "Changing ssrc for SRTP from %u to %u\n", rtp->ssrc, ssrc); - res_srtp->change_source(srtp, rtp->ssrc, ssrc); - if (rtcp_srtp != srtp) { - res_srtp->change_source(rtcp_srtp, rtp->ssrc, ssrc); - } + if (srtp) { + ast_debug(3, "Changing ssrc for SRTP from %u to %u\n", rtp->ssrc, ssrc); + res_srtp->change_source(srtp, rtp->ssrc, ssrc); + if (rtcp_srtp != srtp) { + res_srtp->change_source(rtcp_srtp, rtp->ssrc, ssrc); } } |