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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@421910 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 60761c1fdf73c02a18e4babf3ba1fc14146d5bcd..51d9cf9990f4a0fd3f64b99285d294076db4a0be 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12673,12 +12673,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");