kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_session: Reinvite using active stream topology if none requested."

Browse Source
This commit is contained in:
Jenkins2
2017-12-14 15:22:21 -06:00
committed by Gerrit Code Review
parent 283d2df680 3370cd21df
commit a33207a91f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/res_pjsip_session.c
View File

@@ -3878,10 +3878,15 @@ static struct pjmedia_sdp_session *create_local_sdp(pjsip_inv_session *inv, stru
if (!session->pending_media_state->topology || !ast_stream_topology_get_count(session->pending_media_state->topology)) { if (!session->pending_media_state->topology || !ast_stream_topology_get_count(session->pending_media_state->topology)) {
/* We've encountered a situation where we have been told to create a local SDP but noone has given us any indication /* We've encountered a situation where we have been told to create a local SDP but noone has given us any indication
* of what kind of stream topology they would like. As a fallback we use the topology from the configured endpoint. * of what kind of stream topology they would like. We try to not alter the current state of the SDP negotiation
* by using what is currently negotiated. If this is unavailable we fall back to what is configured on the endpoint.
*/ */
ast_stream_topology_free(session->pending_media_state->topology); ast_stream_topology_free(session->pending_media_state->topology);
session->pending_media_state->topology = ast_stream_topology_clone(session->endpoint->media.topology); if (session->active_media_state->topology) {
session->pending_media_state->topology = ast_stream_topology_clone(session->active_media_state->topology);
} else {
session->pending_media_state->topology = ast_stream_topology_clone(session->endpoint->media.topology);
}
if (!session->pending_media_state->topology) { if (!session->pending_media_state->topology) {
return NULL; return NULL;
} }