From cee660dadf1e809bbc9fc452d711e0da89b006bb Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Sun, 24 Aug 2014 17:22:48 +0000
Subject: [PATCH] chan_sip: Use the server reflexive ICE candidate RTCP port as
provided.
This code originally worked around an issue within res_rtp_asterisk itself.
The wrong socket was being used for the STUN check for RTCP, causing the
port to be the same as RTP. This was subsequently fixed and the RTCP port
provided for the ICE candidate is correct and does not need to be incremented.
ASTERISK-23997 #close
Reported by: Badalian Vyacheslav
Patches:
plus1.diff submitted by Badalian Vyacheslav (license 5249)
........
Merged revisions 421909 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 421910 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 421911 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@421912 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 41ea8e6dc6..197f0bde76 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12691,12 +12691,7 @@ static void add_ice_to_sdp(struct ast_rtp_instance *instance, struct ast_str **a
ast_str_append(a_buf, 0, "a=candidate:%s %u %s %d ", candidate->foundation, candidate->id, candidate->transport, candidate->priority);
ast_str_append(a_buf, 0, "%s ", ast_sockaddr_stringify_host(&candidate->address));
- if (candidate->type == AST_RTP_ICE_CANDIDATE_TYPE_SRFLX
- && candidate->id == AST_RTP_ICE_COMPONENT_RTCP) {
- ast_str_append(a_buf, 0, "%d typ ", ast_sockaddr_port(&candidate->address) + 1);
- } else {
- ast_str_append(a_buf, 0, "%s typ ", ast_sockaddr_stringify_port(&candidate->address));
- }
+ ast_str_append(a_buf, 0, "%s typ ", ast_sockaddr_stringify_port(&candidate->address));
if (candidate->type == AST_RTP_ICE_CANDIDATE_TYPE_HOST) {
ast_str_append(a_buf, 0, "host");
--
GitLab