diff --git a/mediastreamer2 b/mediastreamer2 index 52cc9572a..4a5d8ead9 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 52cc9572a4a338c4308cb2ceec18d8c7ed70b8db +Subproject commit 4a5d8ead921dc66d8d309ea449998f7f6b0e0cbb diff --git a/oRTP b/oRTP index 5d58ed7be..d0846dd66 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 5d58ed7bead312e77bd6f0ac0328352250dd1349 +Subproject commit d0846dd661a9c82d09dfec13a348b340f20385a2 diff --git a/tester/call_single_tester.c b/tester/call_single_tester.c index 0ef27fe6e..bbff03683 100644 --- a/tester/call_single_tester.c +++ b/tester/call_single_tester.c @@ -4850,6 +4850,33 @@ static void call_from_zrtp_to_plain_rtp(void){ call_with_encryption_mandatory(TRUE); } +static void v6_to_v4_call_without_relay(void){ + LinphoneCoreManager* marie; + LinphoneCoreManager* pauline; + bctbx_list_t *lcs = NULL; + + if (liblinphone_tester_ipv4_available() && liblinphone_tester_ipv6_available()){ + marie = linphone_core_manager_new("marie_rc"); + pauline = linphone_core_manager_new2("pauline_tcp_rc", FALSE); + + lcs = bctbx_list_append(lcs, marie->lc); + lcs = bctbx_list_append(lcs, pauline->lc); + linphone_core_enable_ipv6(pauline->lc, FALSE); + linphone_core_manager_start(pauline, TRUE); + + if (BC_ASSERT_TRUE(call(marie,pauline))){ + check_media_direction(marie, linphone_core_get_current_call(marie->lc), lcs, LinphoneMediaDirectionSendRecv, LinphoneMediaDirectionInvalid); + + liblinphone_tester_check_rtcp(marie,pauline); + end_call(marie,pauline); + } + linphone_core_manager_destroy(marie); + linphone_core_manager_destroy(pauline); + bctbx_list_free(lcs); + + }else ms_warning("Test skipped, dual stack not available"); +} + static void v6_call_over_nat_64(void){ LinphoneCoreManager* marie; LinphoneCoreManager* pauline; @@ -4905,6 +4932,7 @@ test_t call_tests[] = { TEST_NO_TAG("Call with http proxy", call_with_http_proxy), TEST_NO_TAG("Call with timeouted bye", call_with_timeouted_bye), TEST_NO_TAG("Direct call over IPv6", direct_call_over_ipv6), + TEST_NO_TAG("Call IPv6 to IPv4 without relay", v6_to_v4_call_without_relay), TEST_NO_TAG("IPv6 call over NAT64", v6_call_over_nat_64), TEST_NO_TAG("Call with ICE in IPv4 with IPv6 enabled", call_with_ice_in_ipv4_with_v6_enabled), TEST_NO_TAG("Outbound call with multiple proxy possible", call_outbound_with_multiple_proxy),