]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-8071 #resolve [RTP stack enforces remote address rules not needed in ICE mode]
authorAnthony Minessale <anthm@freeswitch.org>
Thu, 27 Aug 2015 18:46:08 +0000 (13:46 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Thu, 27 Aug 2015 18:46:26 +0000 (13:46 -0500)
src/switch_rtp.c

index 61e836770780649881f74cad42e0482ea9047abf..008f36b599fa4774f4dd137bc3f9a8d51ffd39cc 100644 (file)
@@ -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;
-
                        }
                }