summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorAlexander Traud <pabstraud@compuserve.com>2017-10-21 10:44:21 +0200
committerAlexander Traud <pabstraud@compuserve.com>2017-10-21 03:46:08 -0500
commitc7a9a6ef0c3a974b7626a15cf23507665ade039f (patch)
tree8cd039d6272e95e471d8096ecbf90a525d634861 /channels
parentfb4ed70e629db9b3264ac5cea03a696048639462 (diff)
chan_sip: Crypto attribute not last but first on SDP media level.
This matches the behavior of the other SIP channel driver, chan_pjsip. ASTERISK-27365 Change-Id: I8f23a51290a58b75816da2999ed1965441dfc5d6
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 120bdd10b..edaa38758 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13806,11 +13806,11 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
case SDP_AUDIO:
if (needaudio) {
add_content(resp, ast_str_buffer(m_audio));
- add_content(resp, ast_str_buffer(a_audio));
- add_content(resp, hold);
if (a_crypto) {
add_content(resp, a_crypto);
}
+ add_content(resp, ast_str_buffer(a_audio));
+ add_content(resp, hold);
} else {
add_content(resp, offer->decline_m_line);
}
@@ -13856,11 +13856,11 @@ static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p, int
/* generate new SDP from scratch, no offers */
if (needaudio) {
add_content(resp, ast_str_buffer(m_audio));
- add_content(resp, ast_str_buffer(a_audio));
- add_content(resp, hold);
if (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 */
add_content(resp, ast_str_buffer(m_video));