From dc4f2a155b37174912070d7e60135ada60659317 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 14 Sep 2017 15:03:46 +0200 Subject: [PATCH] Switch sip transports used by multi call testers to full tcp in case of IPV6 --- tester/call_multi_tester.c | 44 +++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/tester/call_multi_tester.c b/tester/call_multi_tester.c index 1889a3683..da58f20eb 100644 --- a/tester/call_multi_tester.c +++ b/tester/call_multi_tester.c @@ -30,7 +30,17 @@ #define unlink _unlink #endif - +/* + * With IPV6, Flexisip automatically switches to TCP, so it's no more possible to really have Laure configured with UDP + * Anyway for IPV4, it's still a good opportunity to test UDP. + */ +static const char* get_laure_rc(void) { + if (liblinphone_tester_ipv6_available()) { + return "laure_tcp_rc"; + } else { + return "laure_rc_udp"; + } +} static void call_waiting_indication_with_param(bool_t enable_caller_privacy) { bctbx_list_t *iterator; bctbx_list_t* lcs; @@ -45,7 +55,7 @@ static void call_waiting_indication_with_param(bool_t enable_caller_privacy) { linphone_core_remove_supported_tag(pauline->lc,"gruu"); linphone_core_manager_start(pauline,TRUE); LinphoneCoreManager *laure = ms_new0(LinphoneCoreManager, 1); - linphone_core_manager_init(laure, "laure_rc_udp", NULL); + linphone_core_manager_init(laure, get_laure_rc(), NULL); linphone_core_remove_supported_tag(laure->lc,"gruu"); linphone_core_manager_start(laure, TRUE); LinphoneCallParams *laure_params=linphone_core_create_call_params(laure->lc, NULL); @@ -187,7 +197,7 @@ static void second_call_allowed_if_not_using_audio(void){ static void incoming_call_accepted_when_outgoing_call_in_state(LinphoneCallState state) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc"); - LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp"); + LinphoneCoreManager* laure = linphone_core_manager_new( get_laure_rc()); bctbx_list_t* lcs; LinphoneCallParams *laure_params=linphone_core_create_call_params(laure->lc, NULL); LinphoneCallParams *marie_params=linphone_core_create_call_params(marie->lc, NULL); @@ -385,7 +395,7 @@ end: static void simple_conference(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc"); - LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp"); + LinphoneCoreManager* laure = linphone_core_manager_new( get_laure_rc()); simple_conference_base(marie,pauline,laure, NULL, FALSE); linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); @@ -396,7 +406,7 @@ static void simple_conference(void) { static void simple_conference_from_scratch(void){ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc"); - LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp"); + LinphoneCoreManager* laure = linphone_core_manager_new( get_laure_rc()); LinphoneConference *conf; LinphoneConferenceParams *conf_params; LinphoneCall *pauline_call, *laure_call; @@ -469,7 +479,7 @@ static void simple_conference_from_scratch(void){ static void simple_encrypted_conference_with_ice(LinphoneMediaEncryption mode) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc"); - LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp"); + LinphoneCoreManager* laure = linphone_core_manager_new( get_laure_rc()); if (linphone_core_media_encryption_supported(marie->lc,mode)) { linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce); @@ -504,7 +514,7 @@ static void simple_zrtp_conference_with_ice(void) { static void conference_hang_up_call_on_hold(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new("pauline_tcp_rc"); - LinphoneCoreManager* laure = linphone_core_manager_new("laure_rc_udp"); + LinphoneCoreManager* laure = linphone_core_manager_new(get_laure_rc()); simple_conference_base(marie, pauline, laure, NULL, TRUE); linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); @@ -514,7 +524,7 @@ static void conference_hang_up_call_on_hold(void) { static void simple_call_transfer(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc"); - LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp"); + LinphoneCoreManager* laure = linphone_core_manager_new( get_laure_rc()); LinphoneCall* pauline_called_by_marie; LinphoneCall *marie_calling_pauline; LinphoneCall *marie_calling_laure; @@ -579,7 +589,7 @@ end: static void unattended_call_transfer(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc"); - LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp"); + LinphoneCoreManager* laure = linphone_core_manager_new( get_laure_rc()); LinphoneCall* pauline_called_by_marie; char* laure_identity=linphone_address_as_string(laure->identity); @@ -668,7 +678,7 @@ static void unattended_call_transfer_with_error(void) { static void call_transfer_existing_call(bool_t outgoing_call) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc"); - LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp"); + LinphoneCoreManager* laure = linphone_core_manager_new( get_laure_rc()); LinphoneCall* marie_call_pauline; LinphoneCall* pauline_called_by_marie; LinphoneCall* marie_call_laure; @@ -768,7 +778,7 @@ static void call_transfer_existing_call_incoming_call(void) { static void call_transfer_existing_ringing_call(void) { LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_tcp_rc"); - LinphoneCoreManager *laure = linphone_core_manager_new("laure_rc_udp"); + LinphoneCoreManager *laure = linphone_core_manager_new(get_laure_rc()); LinphoneCall *marie_call_pauline; LinphoneCall *pauline_called_by_marie; LinphoneCall *marie_call_laure; @@ -934,7 +944,7 @@ end: static void eject_from_3_participants_local_conference(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc"); - LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp"); + LinphoneCoreManager* laure = linphone_core_manager_new( get_laure_rc()); eject_from_3_participants_conference(marie, pauline, laure, NULL); @@ -946,7 +956,7 @@ static void eject_from_3_participants_local_conference(void) { static void eject_from_4_participants_conference(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc"); - LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp"); + LinphoneCoreManager* laure = linphone_core_manager_new( get_laure_rc()); LinphoneCoreManager* michelle = linphone_core_manager_new( "michelle_rc_udp"); int timeout_ms = 5000; stats initial_laure_stat; @@ -1038,7 +1048,7 @@ end: void simple_remote_conference(void) { LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_tcp_rc"); - LinphoneCoreManager *laure = linphone_core_manager_new("laure_rc_udp"); + LinphoneCoreManager *laure = linphone_core_manager_new(get_laure_rc()); LinphoneConferenceServer *focus = linphone_conference_server_new("conference_focus_rc", TRUE); LpConfig *marie_config = linphone_core_get_config(marie->lc); LinphoneProxyConfig *focus_proxy_config = linphone_core_get_default_proxy_config(((LinphoneCoreManager *)focus)->lc); @@ -1064,7 +1074,7 @@ void simple_remote_conference(void) { void simple_remote_conference_shut_down_focus(void) { LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_tcp_rc"); - LinphoneCoreManager *laure = linphone_core_manager_new("laure_rc_udp"); + LinphoneCoreManager *laure = linphone_core_manager_new(get_laure_rc()); LinphoneConferenceServer *focus = linphone_conference_server_new("conference_focus_rc", FALSE); LpConfig *marie_config = linphone_core_get_config(marie->lc); LinphoneProxyConfig *focus_proxy_config = linphone_core_get_default_proxy_config(((LinphoneCoreManager *)focus)->lc); @@ -1090,7 +1100,7 @@ void simple_remote_conference_shut_down_focus(void) { void eject_from_3_participants_remote_conference(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc"); - LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp"); + LinphoneCoreManager* laure = linphone_core_manager_new( get_laure_rc()); LinphoneConferenceServer *focus = linphone_conference_server_new("conference_focus_rc", TRUE); LpConfig *marie_config = linphone_core_get_config(marie->lc); LinphoneProxyConfig *focus_proxy_config = linphone_core_get_default_proxy_config(((LinphoneCoreManager *)focus)->lc); @@ -1116,7 +1126,7 @@ void eject_from_3_participants_remote_conference(void) { void do_not_stop_ringing_when_declining_one_of_two_incoming_calls(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_tcp_rc"); - LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc_udp"); + LinphoneCoreManager* laure = linphone_core_manager_new( get_laure_rc()); LinphoneCall* pauline_called_by_marie; LinphoneCall* pauline_called_by_laure; LinphoneCallParams *laure_params=linphone_core_create_call_params(laure->lc, NULL);