From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 27 Aug 2015 18:46:08 +0000 (-0500)
Subject: FS-8071 #resolve [RTP stack enforces remote address rules not needed in ICE mode]
X-Git-Tag: v1.6.2~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d415d1d3bf86780c6fe905bf6cf353cadc4cded7;p=thirdparty%2Ffreeswitch.git

FS-8071 #resolve [RTP stack enforces remote address rules not needed in ICE mode]
---

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 61e8367707..008f36b599 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -6408,17 +6408,15 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 			*flags &= ~SFF_NOT_AUDIO; /* If this flag was already set, make sure to remove it when we get real audio */
 		}
 
-
-		/* ignore packets not meant for us unless the auto-adjust window is open */
-		if (bytes) {
+		/* ignore packets not meant for us unless the auto-adjust window is open (ice mode has its own alternatives to this) */
+		if (!using_ice(rtp_session) && bytes) {
 			if (rtp_session->flags[SWITCH_RTP_FLAG_AUTOADJ]) {
 				if (rtp_session->recv_msg.header.pt == rtp_session->cng_pt || rtp_session->recv_msg.header.pt == 13) {
 					goto recvfrom;
 
 				}
-			} else if (!(rtp_session->rtp_bugs & RTP_BUG_ACCEPT_ANY_PACKETS) && !switch_cmp_addr(rtp_session->from_addr, rtp_session->remote_addr)) {
+			} else if (!(rtp_session->rtp_bugs & RTP_BUG_ACCEPT_ANY_PACKETS) && !switch_cmp_addr(rtp_session->rtp_from_addr, rtp_session->remote_addr)) {
 				goto recvfrom;
-
 			}
 		}