]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-10267: [freeswitch-core] zrtp_enrollment broken since 1.6.13 #resolve
authorBrian West <brian@freeswitch.org>
Mon, 8 May 2017 21:58:16 +0000 (16:58 -0500)
committerMike Jerris <mike@jerris.com>
Thu, 1 Jun 2017 20:13:01 +0000 (16:13 -0400)
src/switch_rtp.c

index d19c872c31cee8ab2ec27d565400b825cb7b10d5..408bb57f4780a7746ed4055be5b77ea74651e636 100644 (file)
@@ -5584,6 +5584,11 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
                                        switch_mutex_lock(rtp_session->flag_mutex);
                                        for (pmap = *rtp_session->pmaps; pmap && pmap->allocated; pmap = pmap->next) {
 
+                                               if (ntohl(*(int *)(b+4)) == ZRTP_MAGIC_COOKIE) {
+                                                       accept_packet = 1;
+                                                       break;
+                                               }
+
                                                if (!pmap->negotiated) {
                                                        continue;
                                                }