sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "res/res_pjsip_sdp_rtp: put rtcp-mux in answer only if offered" into 16

This commit is contained in:
George Joseph 2018-08-16 09:46:09 -05:00 committed by Gerrit Code Review
parent 6e0f4a2127 0d4bde84d1
commit 4f95992d36
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_pjsip_sdp_rtp.c
View File

@ -1796,8 +1796,8 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as
attr->name = !session_media->locally_held ? STR_SENDRECV : STR_SENDONLY;
media->attr[media->attr_count++] = attr;
/* If we've got rtcp-mux enabled, just unconditionally offer it in all SDPs */
if (session->endpoint->media.rtcp_mux) {
/* If we've got rtcp-mux enabled, add it unless we received an offer without it */
if (session->endpoint->media.rtcp_mux && session_media->remote_rtcp_mux) {
attr = pjmedia_sdp_attr_create(pool, "rtcp-mux", NULL);
pjmedia_sdp_attr_add(&media->attr_count, media->attr, attr);
}

1
res/res_pjsip_session.c
View File

@ -445,6 +445,7 @@ struct ast_sip_session_media *ast_sip_session_media_state_add(struct ast_sip_ses
session_media->encryption = session->endpoint->media.rtp.encryption;
session_media->remote_ice = session->endpoint->media.rtp.ice_support;
session_media->remote_rtcp_mux = session->endpoint->media.rtcp_mux;
session_media->keepalive_sched_id = -1;
session_media->timeout_sched_id = -1;
session_media->type = type;