From 7de2c1bf33db8787f1bb698d47654af37337f2a1 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 27 May 2015 18:00:29 +0200 Subject: [PATCH] ms2: disable symmetric rtp triggered by stun in case of multicast --- coreapi/linphonecall.c | 2 +- mediastreamer2 | 2 +- tester/multicast_call_tester.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index fa21303f6..5e486370c 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -748,7 +748,7 @@ static int select_random_port(LinphoneCore *lc, int stream_index, int min_port, int existing_port = 0; bool_t already_used = FALSE; - tried_port = (rand() % (max_port - min_port) + min_port) & ~0x1; + tried_port = (ortp_random() % (max_port - min_port) + min_port) & ~0x1; if (tried_port < min_port) tried_port = min_port + 2; for (nb_tries = 0; nb_tries < 100; nb_tries++) { for (elem = lc->calls; elem != NULL; elem = elem->next) { diff --git a/mediastreamer2 b/mediastreamer2 index e4dcc515c..175a46b05 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit e4dcc515cebd7cf1b51cb538743312df53aaf0a0 +Subproject commit 175a46b05d85a9dec2e5b3671db59340f1c3bd25 diff --git a/tester/multicast_call_tester.c b/tester/multicast_call_tester.c index eb1c3542a..05c8ebe09 100644 --- a/tester/multicast_call_tester.c +++ b/tester/multicast_call_tester.c @@ -53,7 +53,7 @@ static void call_multicast_base(bool_t video) { linphone_core_enable_audio_multicast(pauline->lc,TRUE); BC_ASSERT_TRUE(call(pauline,marie)); - wait_for_until(marie->lc, pauline->lc, NULL, 1, 4000); + wait_for_until(marie->lc, pauline->lc, NULL, 1, 6000); if (linphone_core_get_current_call(marie->lc)) { BC_ASSERT_GREATER(linphone_core_manager_get_max_audio_down_bw(marie),70,int,"%d"); if (video) {