kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-13 13:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
George Joseph
2018-08-16 09:46:00 -05:00
committed by Gerrit Code Review
parent 7df97d0a00 a1b0db826a
commit 0c4d49c5a9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_pjsip_sdp_rtp.c
View File

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

1
res/res_pjsip_session.c
View File

@@ -1342,6 +1342,7 @@ static int add_session_media(void *obj, void *arg, int flags)
} }
session_media->encryption = session->endpoint->media.rtp.encryption; session_media->encryption = session->endpoint->media.rtp.encryption;
session_media->remote_ice = session->endpoint->media.rtp.ice_support; session_media->remote_ice = session->endpoint->media.rtp.ice_support;
session_media->remote_rtcp_mux = session->endpoint->rtcp_mux;
session_media->keepalive_sched_id = -1; session_media->keepalive_sched_id = -1;
session_media->timeout_sched_id = -1; session_media->timeout_sched_id = -1;
/* Safe use of strcpy */ /* Safe use of strcpy */