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

Merge "chan_sip: Crypto attribute not last but first on SDP media level."

Browse Source
This commit is contained in:
Joshua Colp
2017-10-24 09:28:36 -05:00
committed by Gerrit Code Review
parent 8b719a3e48 840e08716b
commit 2842ae0daf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_sip.c
View File

@@ -13864,11 +13864,11 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
case SDP_AUDIO: case SDP_AUDIO:
if (needaudio) { if (needaudio) {
add_content(resp, ast_str_buffer(m_audio)); add_content(resp, ast_str_buffer(m_audio));
add_content(resp, ast_str_buffer(a_audio));
add_content(resp, hold);
if (a_crypto) { if (a_crypto) {
add_content(resp, a_crypto); add_content(resp, a_crypto);
} }
add_content(resp, ast_str_buffer(a_audio));
add_content(resp, hold);
} else { } else {
add_content(resp, offer->decline_m_line); add_content(resp, offer->decline_m_line);
} }
@@ -13914,11 +13914,11 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
/* generate new SDP from scratch, no offers */ /* generate new SDP from scratch, no offers */
if (needaudio) { if (needaudio) {
add_content(resp, ast_str_buffer(m_audio)); add_content(resp, ast_str_buffer(m_audio));
add_content(resp, ast_str_buffer(a_audio));
add_content(resp, hold);
if (a_crypto) { if (a_crypto) {
add_content(resp, a_crypto); add_content(resp, a_crypto);
} }
add_content(resp, ast_str_buffer(a_audio));
add_content(resp, hold);
} }
if (needvideo) { /* only if video response is appropriate */ if (needvideo) { /* only if video response is appropriate */
add_content(resp, ast_str_buffer(m_video)); add_content(resp, ast_str_buffer(m_video));