From da2c63a6a96e07d8a9886b97b8c1dab079c36395 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 22 Jun 2015 11:49:14 +0200 Subject: [PATCH] tester: change transport_supported to not take linphonecore argument since we dont need it --- tester/call_tester.c | 200 ++++++++++++++-------------- tester/flexisip_tester.c | 60 ++++----- tester/liblinphone_tester.h | 2 +- tester/log_collection_tester.c | 6 +- tester/message_tester.c | 48 +++---- tester/register_tester.c | 92 +++++++------ tester/remote_provisioning_tester.c | 6 +- tester/tester.c | 7 +- 8 files changed, 209 insertions(+), 212 deletions(-) diff --git a/tester/call_tester.c b/tester/call_tester.c index c20a94b4f..92f56a1e7 100644 --- a/tester/call_tester.c +++ b/tester/call_tester.c @@ -366,52 +366,50 @@ void simple_call_base(bool_t enable_multicast_recv_side) { const char* marie_id = NULL; belle_sip_object_enable_leak_detector(TRUE); - begin=belle_sip_object_get_object_count(); +begin=belle_sip_object_get_object_count(); - marie = linphone_core_manager_new( "marie_rc"); - if (transport_supported(marie->lc, LinphoneTransportTls)) { - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); +marie = linphone_core_manager_new( "marie_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); - /* with the account manager, we might lose the identity */ - marie_cfg = linphone_core_get_default_proxy_config(marie->lc); - marie_id = linphone_proxy_config_get_identity(marie_cfg); - { - LinphoneAddress* marie_addr = linphone_address_new(marie_id); - char* marie_tmp_id = NULL; - linphone_address_set_display_name(marie_addr, "Super Marie"); - marie_tmp_id = linphone_address_as_string(marie_addr); + /* with the account manager, we might lose the identity */ + marie_cfg = linphone_core_get_default_proxy_config(marie->lc); + marie_id = linphone_proxy_config_get_identity(marie_cfg); + { + LinphoneAddress* marie_addr = linphone_address_new(marie_id); + char* marie_tmp_id = NULL; + linphone_address_set_display_name(marie_addr, "Super Marie"); + marie_tmp_id = linphone_address_as_string(marie_addr); - linphone_proxy_config_edit(marie_cfg); - linphone_proxy_config_set_identity(marie_cfg,marie_tmp_id); - linphone_proxy_config_done(marie_cfg); + linphone_proxy_config_edit(marie_cfg); + linphone_proxy_config_set_identity(marie_cfg,marie_tmp_id); + linphone_proxy_config_done(marie_cfg); - ms_free(marie_tmp_id); - linphone_address_unref(marie_addr); - } + ms_free(marie_tmp_id); + linphone_address_unref(marie_addr); + } - linphone_core_enable_audio_multicast(pauline->lc,enable_multicast_recv_side); + linphone_core_enable_audio_multicast(pauline->lc,enable_multicast_recv_side); - BC_ASSERT_TRUE(call(marie,pauline)); - pauline_call=linphone_core_get_current_call(pauline->lc); - BC_ASSERT_PTR_NOT_NULL(pauline_call); - /*check that display name is correctly propagated in From */ - if (pauline_call){ - from=linphone_call_get_remote_address(linphone_core_get_current_call(pauline->lc)); - BC_ASSERT_PTR_NOT_NULL(from); - if (from){ - const char *dname=linphone_address_get_display_name(from); - BC_ASSERT_PTR_NOT_NULL(dname); - if (dname){ - BC_ASSERT_STRING_EQUAL(dname, "Super Marie"); - } + BC_ASSERT_TRUE(call(marie,pauline)); + pauline_call=linphone_core_get_current_call(pauline->lc); + BC_ASSERT_PTR_NOT_NULL(pauline_call); + /*check that display name is correctly propagated in From */ + if (pauline_call){ + from=linphone_call_get_remote_address(linphone_core_get_current_call(pauline->lc)); + BC_ASSERT_PTR_NOT_NULL(from); + if (from){ + const char *dname=linphone_address_get_display_name(from); + BC_ASSERT_PTR_NOT_NULL(dname); + if (dname){ + BC_ASSERT_STRING_EQUAL(dname, "Super Marie"); } } - - - liblinphone_tester_check_rtcp(marie,pauline); - end_call(marie,pauline); - linphone_core_manager_destroy(pauline); } + + + liblinphone_tester_check_rtcp(marie,pauline); + end_call(marie,pauline); + linphone_core_manager_destroy(pauline); linphone_core_manager_destroy(marie); leaked_objects=belle_sip_object_get_object_count()-begin; @@ -435,7 +433,7 @@ static void call_with_timeouted_bye(void) { begin=belle_sip_object_get_object_count(); marie = linphone_core_manager_new( "marie_rc"); - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); BC_ASSERT_TRUE(call(marie,pauline)); @@ -508,7 +506,7 @@ static void direct_call_over_ipv6(){ LCSipTransports pauline_transports; LinphoneAddress* pauline_dest = linphone_address_new("sip:[::1];transport=tcp"); marie = linphone_core_manager_new( "marie_rc"); - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); linphone_core_enable_ipv6(marie->lc,TRUE); linphone_core_enable_ipv6(pauline->lc,TRUE); @@ -670,7 +668,7 @@ static void multiple_answers_call_with_media_relay(void) { static void call_with_specified_codec_bitrate(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); const LinphoneCallStats *pauline_stats,*marie_stats; bool_t call_ok; char * codec = "opus"; @@ -723,7 +721,7 @@ end: static void simple_call_compatibility_mode(void) { char route[256]; LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCore* lc_marie=marie->lc; LinphoneCore* lc_pauline=pauline->lc; @@ -789,7 +787,7 @@ static void simple_call_compatibility_mode(void) { static void cancelled_call(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall* out_call = linphone_core_invite_address(pauline->lc,marie->identity); linphone_call_ref(out_call); @@ -883,7 +881,7 @@ static void early_cancelled_call(void) { static void cancelled_ringing_call(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall* out_call = linphone_core_invite_address(pauline->lc,marie->identity); linphone_call_ref(out_call); @@ -902,7 +900,7 @@ static void cancelled_ringing_call(void) { static void early_declined_call(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCallLog* out_call_log; LinphoneCall* out_call; @@ -943,7 +941,7 @@ static void call_busy_when_calling_self(void) { static void call_declined(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall* in_call; LinphoneCall* out_call = linphone_core_invite_address(pauline->lc,marie->identity); @@ -968,7 +966,7 @@ static void call_declined(void) { static void call_terminated_by_caller(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); BC_ASSERT_TRUE(call(pauline,marie)); /*just to sleep*/ @@ -982,7 +980,7 @@ static void call_terminated_by_caller(void) { static void call_with_no_sdp(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); linphone_core_enable_sdp_200_ack(marie->lc,TRUE); @@ -998,7 +996,7 @@ static void call_with_no_sdp(void) { static void call_with_no_sdp_ack_without_sdp(void){ LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall *call; linphone_core_enable_sdp_200_ack(marie->lc,TRUE); @@ -1117,7 +1115,7 @@ end: } static void _call_with_ice(bool_t caller_with_ice, bool_t callee_with_ice, bool_t random_ports) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); _call_with_ice_base(pauline,marie,caller_with_ice,callee_with_ice,random_ports); linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); @@ -1129,7 +1127,7 @@ static void call_with_ice(void){ /*ICE is not expected to work in this case, however this should not crash*/ static void call_with_ice_no_sdp(void){ LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); linphone_core_enable_sdp_200_ack(pauline->lc,TRUE); @@ -1159,7 +1157,7 @@ static void not_ice_to_ice(void){ static void call_with_custom_headers(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall *call_marie,*call_pauline; LinphoneCallParams *params; const LinphoneCallParams *marie_remote_params; @@ -1230,7 +1228,7 @@ static void call_with_custom_headers(void) { void call_paused_resumed_base(bool_t multicast) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall* call_pauline; const rtp_stats_t * stats; bool_t call_ok; @@ -1287,7 +1285,7 @@ static void call_paused_resumed(void) { static void call_paused_resumed_with_loss(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall* call_pauline; const rtp_stats_t * stats; float loss_percentage; @@ -1347,7 +1345,7 @@ bool_t pause_call_1(LinphoneCoreManager* mgr_1,LinphoneCall* call_1,LinphoneCore #if 0 void concurrent_paused_resumed_base() { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall* call_pauline,call_marie; const rtp_stats_t * stats; @@ -1391,7 +1389,7 @@ void concurrent_paused_resumed_base() { #endif static void call_paused_resumed_from_callee(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall* call_marie; const rtp_stats_t * stats; bool_t call_ok; @@ -1429,7 +1427,7 @@ end: static void audio_call_with_ice_no_matching_audio_codecs(void) { LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall *out_call; linphone_core_enable_payload_type(marie->lc, linphone_core_find_payload_type(marie->lc, "PCMU", 8000, 1), FALSE); /* Disable PCMU */ @@ -1580,7 +1578,7 @@ static bool_t remove_video(LinphoneCoreManager *caller, LinphoneCoreManager *cal static void call_with_video_added(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); bool_t call_ok; BC_ASSERT_TRUE((call_ok=call(pauline,marie))); @@ -1599,7 +1597,7 @@ end: static void call_with_video_added_2(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); bool_t call_ok; /*in this variant marie is already in automatically accept*/ LinphoneVideoPolicy marie_policy; @@ -1625,7 +1623,7 @@ end: static void call_with_video_added_random_ports(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); bool_t call_ok; linphone_core_set_audio_port(marie->lc,-1); @@ -1649,7 +1647,7 @@ end: static void call_with_several_video_switches(void) { int dummy = 0; LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); bool_t call_ok; BC_ASSERT_TRUE(call_ok=call(pauline,marie)); @@ -1673,7 +1671,7 @@ end: static void srtp_call_with_several_video_switches(void) { int dummy = 0; LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); bool_t call_ok; if (linphone_core_media_encryption_supported(marie->lc, LinphoneMediaEncryptionSRTP)) { @@ -1703,7 +1701,7 @@ end: static void call_with_declined_video_base(bool_t using_policy) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall* marie_call; LinphoneCall* pauline_call; LinphoneVideoPolicy marie_policy, pauline_policy; @@ -1847,7 +1845,7 @@ static void video_call_base(LinphoneCoreManager* pauline,LinphoneCoreManager* ma } static void video_call(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionNone,TRUE,TRUE); linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); @@ -1855,7 +1853,7 @@ static void video_call(void) { static void video_call_zrtp(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); if (linphone_core_media_encryption_supported(marie->lc,LinphoneMediaEncryptionZRTP)) { video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionZRTP,TRUE,TRUE); } else @@ -1866,7 +1864,7 @@ static void video_call_zrtp(void) { static void video_call_dtls(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); if (linphone_core_media_encryption_supported(pauline->lc,LinphoneMediaEncryptionDTLS)) { video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionDTLS,TRUE,TRUE); } else @@ -1878,7 +1876,7 @@ static void video_call_dtls(void) { static void video_call_using_policy(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); video_call_base(marie,pauline,TRUE,LinphoneMediaEncryptionNone,TRUE,TRUE); linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); @@ -1886,7 +1884,7 @@ static void video_call_using_policy(void) { static void video_call_using_policy_with_callee_video_disabled(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); video_call_base(marie,pauline,TRUE,LinphoneMediaEncryptionNone,FALSE,TRUE); linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); @@ -1894,7 +1892,7 @@ static void video_call_using_policy_with_callee_video_disabled(void) { static void video_call_using_policy_with_caller_video_disabled(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); video_call_base(marie,pauline,TRUE,LinphoneMediaEncryptionNone,TRUE,FALSE); linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); @@ -1902,7 +1900,7 @@ static void video_call_using_policy_with_caller_video_disabled(void) { static void video_call_no_sdp(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); linphone_core_enable_sdp_200_ack(pauline->lc,TRUE); video_call_base(pauline,marie,FALSE,LinphoneMediaEncryptionNone,TRUE,TRUE); linphone_core_manager_destroy(marie); @@ -1911,7 +1909,7 @@ static void video_call_no_sdp(void) { static void call_with_ice_video_to_novideo(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneVideoPolicy vpol={0}; vpol.automatically_initiate=TRUE; linphone_core_set_video_policy(pauline->lc,&vpol); @@ -1925,7 +1923,7 @@ static void call_with_ice_video_to_novideo(void) { static void _call_with_ice_video(LinphoneVideoPolicy caller_policy, LinphoneVideoPolicy callee_policy, bool_t video_added_by_caller, bool_t video_added_by_callee, bool_t video_removed_by_caller, bool_t video_removed_by_callee) { LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); bool_t call_ok; linphone_core_set_video_policy(pauline->lc, &caller_policy); @@ -1993,7 +1991,7 @@ static void call_with_ice_video_added_and_refused(void) { static void video_call_with_early_media_no_matching_audio_codecs(void) { LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall *out_call, *pauline_call; LinphoneVideoPolicy vpol={0}; @@ -2047,7 +2045,7 @@ end: static void video_call_limited_bandwidth(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); linphone_core_set_download_bandwidth(pauline->lc, 100); video_call_base(marie,pauline,FALSE,LinphoneMediaEncryptionNone,TRUE,TRUE); @@ -2065,7 +2063,7 @@ static void video_call_limited_bandwidth(void) { static void _call_with_media_relay(bool_t random_ports) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); bool_t call_ok; linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL); @@ -2105,7 +2103,7 @@ static void call_with_media_relay_random_ports(void) { static void call_with_privacy(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall *c1,*c2; LinphoneCallParams *params; LinphoneProxyConfig* pauline_proxy; @@ -2165,7 +2163,7 @@ static void call_with_privacy(void) { /*this ones makes call with privacy without previous registration*/ static void call_with_privacy2(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new2(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc", FALSE); + LinphoneCoreManager* pauline = linphone_core_manager_new2(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc", FALSE); LinphoneCall *c1,*c2; LinphoneCallParams *params; LinphoneProxyConfig* pauline_proxy; @@ -2271,7 +2269,7 @@ static void dtls_srtp_ice_video_call_with_relay() { #endif static void call_with_declined_srtp(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); if (linphone_core_media_encryption_supported(marie->lc,LinphoneMediaEncryptionSRTP)) { linphone_core_set_media_encryption(pauline->lc,LinphoneMediaEncryptionSRTP); @@ -2293,7 +2291,7 @@ static void call_srtp_paused_and_resumed(void) { * As a result it must not use the call() function because it calls linphone_call_get_current_params(). */ LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); const LinphoneCallParams *params; LinphoneCall *pauline_call; @@ -2339,7 +2337,7 @@ static void on_eof(LinphonePlayer *player, void *user_data){ static void call_with_file_player(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphonePlayer *player; char hellopath[256]; char *recordpath = create_filepath(bc_tester_writable_dir_prefix, "record-call_with_file_player", "wav"); @@ -2407,7 +2405,7 @@ static bool_t is_format_supported(LinphoneCore *lc, const char *fmt){ static void call_with_mkv_file_player(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphonePlayer *player; char hellomkv[256]; char hellowav[256]; @@ -2606,7 +2604,7 @@ static void dtls_ice_call_with_relay(void) { static void early_media_call(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_early_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); BC_ASSERT_TRUE(call(pauline,marie)); @@ -2689,7 +2687,7 @@ static void early_media_call_with_ringing(void){ static void early_media_call_with_update_base(bool_t media_change){ LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); MSList* lcs = NULL; LinphoneCall *marie_call, *pauline_call; LinphoneCallParams *pauline_params; @@ -2776,7 +2774,7 @@ static void check_call_state(LinphoneCoreManager* mgr,LinphoneCallState state) { static void call_established_with_rejected_info(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); int dummy=0; bool_t call_ok=FALSE; @@ -2810,7 +2808,7 @@ static void call_established_with_rejected_info(void) { static void call_established_with_rejected_reinvite(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); bool_t call_ok=FALSE; BC_ASSERT_TRUE(call_ok=call(pauline,marie)); @@ -2844,7 +2842,7 @@ static void call_established_with_rejected_reinvite(void) { static void call_established_with_rejected_incoming_reinvite(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); bool_t call_ok=FALSE; BC_ASSERT_TRUE((call_ok=call(pauline,marie))); @@ -2883,7 +2881,7 @@ static void call_established_with_rejected_incoming_reinvite(void) { static void call_redirect(void){ LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCoreManager* laure = linphone_core_manager_new("laure_rc"); MSList* lcs = NULL; char *margaux_url = NULL; @@ -2937,7 +2935,7 @@ static void call_redirect(void){ static void call_established_with_rejected_reinvite_with_error(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); bool_t call_ok=TRUE; BC_ASSERT_TRUE((call_ok=call(pauline,marie))); @@ -3215,7 +3213,7 @@ static void accept_call_in_send_base(bool_t caller_has_ice) { begin=belle_sip_object_get_object_count(); marie = linphone_core_manager_new("marie_rc"); - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); if (caller_has_ice) { linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce); } @@ -3257,7 +3255,7 @@ void two_accepted_call_in_send_only() { begin=belle_sip_object_get_object_count(); marie = linphone_core_manager_new("marie_rc"); - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); laure = linphone_core_manager_new("laure_rc"); lcs=ms_list_append(lcs,pauline->lc); @@ -3364,7 +3362,7 @@ static void video_call_recording_test(void) { static void video_call_snapshot(void) { LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCallParams *marieParams = linphone_core_create_default_call_parameters(marie->lc); LinphoneCallParams *paulineParams = linphone_core_create_default_call_parameters(pauline->lc); LinphoneCall *callInst = NULL; @@ -3406,7 +3404,7 @@ static void call_with_in_dialog_update(void) { begin=belle_sip_object_get_object_count(); marie = linphone_core_manager_new( "marie_rc"); - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); BC_ASSERT_TRUE(call_ok=call(pauline,marie)); if (!call_ok) goto end; @@ -3444,7 +3442,7 @@ static void call_with_in_dialog_codec_change_base(bool_t no_sdp) { begin=belle_sip_object_get_object_count(); marie = linphone_core_manager_new( "marie_rc"); - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); BC_ASSERT_TRUE(call_ok=call(pauline,marie)); if (!call_ok) goto end; @@ -3499,7 +3497,7 @@ static void call_with_custom_supported_tags(void) { begin=belle_sip_object_get_object_count(); marie = linphone_core_manager_new( "marie_rc"); - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); linphone_core_add_supported_tag(marie->lc,"pouet-tag"); BC_ASSERT_TRUE(call_ok=call(pauline,marie)); @@ -3525,7 +3523,7 @@ end: static void call_log_from_taken_from_p_asserted_id(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCall *c1,*c2; LinphoneCallParams *params; const char* paulie_asserted_id ="\"Paupauche\" "; @@ -3696,7 +3694,7 @@ static void call_with_paused_no_sdp_on_resume() { begin=belle_sip_object_get_object_count(); marie = linphone_core_manager_new( "marie_rc"); - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); BC_ASSERT_TRUE(call(pauline,marie)); liblinphone_tester_check_rtcp(marie,pauline); @@ -3744,7 +3742,7 @@ end: static void early_media_without_sdp_in_200_base( bool_t use_video, bool_t use_ice ){ LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); MSList* lcs = NULL; LinphoneCall* marie_call; LinphoneCallParams* params = NULL; @@ -3842,7 +3840,7 @@ static void call_with_generic_cn(void) { begin=belle_sip_object_get_object_count(); marie = linphone_core_manager_new( "marie_rc"); - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); remove(recorded_file); @@ -3923,7 +3921,7 @@ static void call_with_transport_change_base(bool_t succesfull_call) { v_table = linphone_core_v_table_new(); v_table->call_state_changed=call_state_changed_2; marie = linphone_core_manager_new("marie_rc"); - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); linphone_core_add_listener(marie->lc,v_table); v_table = linphone_core_v_table_new(); v_table->call_state_changed=call_state_changed_3; @@ -3978,7 +3976,7 @@ static void video_call_with_re_invite_inactive_followed_by_re_invite_base(Linpho begin=belle_sip_object_get_object_count(); marie = linphone_core_manager_new( "marie_rc"); - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); linphone_core_set_avpf_mode(pauline->lc,TRUE); linphone_core_set_video_device(pauline->lc,"Mire: Mire (synthetic moving picture)"); linphone_core_set_video_device(marie->lc,"Mire: Mire (synthetic moving picture)"); @@ -4064,7 +4062,7 @@ static void srtp_video_call_with_re_invite_inactive_followed_by_re_invite_no_sdp } static void video_call_ice_params() { LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce); linphone_core_set_firewall_policy(pauline->lc,LinphonePolicyUseIce); @@ -4088,7 +4086,7 @@ static void simple_stereo_call(const char *codec_name, int clock_rate, int bitra begin=belle_sip_object_get_object_count(); marie = linphone_core_manager_new( "marie_rc"); - pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); /*make sure we have opus*/ pt = linphone_core_find_payload_type(marie->lc, codec_name, clock_rate, 2); diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c index 3df7a5a43..4148869be 100644 --- a/tester/flexisip_tester.c +++ b/tester/flexisip_tester.c @@ -24,8 +24,8 @@ static void subscribe_forking(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); - LinphoneCoreManager* pauline2 = linphone_core_manager_new( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline2 = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneContent* content; LinphoneEvent *lev; int expires= 600; @@ -60,7 +60,7 @@ static void subscribe_forking(void) { static void message_forking(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc"); MSList* lcs=ms_list_append(NULL,marie->lc); char* to = linphone_address_as_string(marie->identity); @@ -84,7 +84,7 @@ static void message_forking(void) { static void message_forking_with_unreachable_recipients(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc"); MSList* lcs=ms_list_append(NULL,marie->lc); @@ -126,7 +126,7 @@ static void message_forking_with_unreachable_recipients(void) { static void message_forking_with_all_recipients_unreachable(void) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc"); MSList* lcs=ms_list_append(NULL,marie->lc); @@ -176,7 +176,7 @@ static void message_forking_with_all_recipients_unreachable(void) { static void call_forking(void){ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc"); MSList* lcs=ms_list_append(NULL,pauline->lc); @@ -222,7 +222,7 @@ static void call_forking(void){ static void call_forking_with_urgent_reply(void){ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc"); MSList* lcs=ms_list_append(NULL,pauline->lc); @@ -267,7 +267,7 @@ static void call_forking_with_urgent_reply(void){ static void call_forking_cancelled(void){ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc"); MSList* lcs=ms_list_append(NULL,pauline->lc); @@ -307,7 +307,7 @@ static void call_forking_cancelled(void){ static void call_forking_declined(bool_t declined_globaly){ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc"); MSList* lcs=ms_list_append(NULL,pauline->lc); @@ -371,7 +371,7 @@ static void call_forking_declined_localy(void){ static void call_forking_with_push_notification_single(void){ MSList* lcs; LinphoneCoreManager* marie = linphone_core_manager_new2( "marie_rc", FALSE); - LinphoneCoreManager* pauline = linphone_core_manager_new2( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc",FALSE); + LinphoneCoreManager* pauline = linphone_core_manager_new2( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc",FALSE); int dummy=0; linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL); @@ -382,7 +382,7 @@ static void call_forking_with_push_notification_single(void){ lcs=ms_list_append(NULL,pauline->lc); lcs=ms_list_append(lcs,marie->lc); - + BC_ASSERT_TRUE(wait_for_list(lcs,&pauline->stat.number_of_LinphoneRegistrationOk,1,5000)); BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneRegistrationOk,1,5000)); @@ -420,7 +420,7 @@ static void call_forking_with_push_notification_single(void){ static void call_forking_with_push_notification_multiple(void){ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc"); MSList* lcs=ms_list_append(NULL,pauline->lc); @@ -472,7 +472,7 @@ static void call_forking_with_push_notification_multiple(void){ static void call_forking_not_responded(void){ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCoreManager* marie2 = linphone_core_manager_new( "marie_rc"); LinphoneCoreManager* marie3 = linphone_core_manager_new( "marie_rc"); MSList* lcs=ms_list_append(NULL,pauline->lc); @@ -510,7 +510,7 @@ static void call_forking_not_responded(void){ static void early_media_call_forking(void) { LinphoneCoreManager* marie = linphone_core_manager_new("marie_early_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneCoreManager* marie2 = linphone_core_manager_new("marie_early_rc"); MSList *lcs=NULL; LinphoneCallParams *params=linphone_core_create_default_call_parameters(pauline->lc); @@ -590,10 +590,10 @@ static void early_media_call_forking(void) { } static void call_with_sips(void){ - LinphoneCoreManager* pauline2 = linphone_core_manager_new( "pauline_tcp_rc"); - if (transport_supported(pauline2->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { LinphoneCoreManager* marie = linphone_core_manager_new( "marie_sips_rc"); LinphoneCoreManager* pauline1 = linphone_core_manager_new( "pauline_sips_rc"); + LinphoneCoreManager* pauline2 = linphone_core_manager_new( "pauline_tcp_rc"); MSList* lcs=ms_list_append(NULL,marie->lc); lcs=ms_list_append(lcs,pauline1->lc); @@ -626,14 +626,14 @@ static void call_with_sips(void){ linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline1); + linphone_core_manager_destroy(pauline2); ms_list_free(lcs); } - linphone_core_manager_destroy(pauline2); } static void call_with_sips_not_achievable(void){ - LinphoneCoreManager* pauline2 = linphone_core_manager_new( "pauline_tcp_rc"); - if (transport_supported(pauline2->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* pauline2 = linphone_core_manager_new( "pauline_tcp_rc"); LinphoneCoreManager* marie = linphone_core_manager_new( "marie_sips_rc"); LinphoneCoreManager* pauline1 = linphone_core_manager_new( "pauline_rc"); MSList* lcs=ms_list_append(NULL,marie->lc); @@ -661,9 +661,9 @@ static void call_with_sips_not_achievable(void){ linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline1); + linphone_core_manager_destroy(pauline2); ms_list_free(lcs); } - linphone_core_manager_destroy(pauline2); } static void call_with_ipv6(void) { @@ -686,7 +686,7 @@ static void call_with_ipv6(void) { liblinphone_tester_enable_ipv6(TRUE); marie = linphone_core_manager_new( "marie_rc"); - pauline = linphone_core_manager_new( transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + pauline = linphone_core_manager_new( transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); linphone_core_set_user_agent(marie->lc,"Natted Linphone",NULL); linphone_core_set_user_agent(pauline->lc,"Natted Linphone",NULL); @@ -725,8 +725,8 @@ static void call_with_ipv6(void) { } static void file_transfer_message_rcs_to_external_body_client(void) { - LinphoneCoreManager* marie = linphone_core_manager_init( "marie_rc"); - if (transport_supported(marie->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* marie = linphone_core_manager_init( "marie_rc"); char* to; LinphoneChatRoom* chat_room; LinphoneChatMessage* message; @@ -829,8 +829,8 @@ static void send_file_transfer_message_using_external_body_url(LinphoneCoreManag } static void file_transfer_message_external_body_to_external_body_client(void) { - LinphoneCoreManager* marie = linphone_core_manager_init( "marie_rc"); - if (transport_supported(marie->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* marie = linphone_core_manager_init( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_init( "pauline_rc"); linphone_proxy_config_set_custom_header(marie->lc->default_proxy, "Accept", "application/sdp"); @@ -848,13 +848,13 @@ static void file_transfer_message_external_body_to_external_body_client(void) { send_file_transfer_message_using_external_body_url(marie, pauline); linphone_core_manager_destroy(pauline); + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); } static void file_transfer_message_external_body_to_rcs_client(void) { - LinphoneCoreManager* marie = linphone_core_manager_init( "marie_rc"); - if (transport_supported(marie->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* marie = linphone_core_manager_init( "marie_rc"); LinphoneCoreManager* pauline = linphone_core_manager_init( "pauline_rc"); linphone_proxy_config_set_custom_header(marie->lc->default_proxy, "Accept", "application/sdp"); @@ -869,8 +869,8 @@ static void file_transfer_message_external_body_to_rcs_client(void) { send_file_transfer_message_using_external_body_url(marie, pauline); linphone_core_manager_destroy(pauline); + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); } static void dos_module_trigger(void) { @@ -879,7 +879,7 @@ static void dos_module_trigger(void) { int i = 0; int number_of_messge_to_send = 100; LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); - LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(marie->lc, LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); + LinphoneCoreManager* pauline = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); reset_counters(&marie->stat); reset_counters(&pauline->stat); diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h index 4651a84d0..a098c4e24 100644 --- a/tester/liblinphone_tester.h +++ b/tester/liblinphone_tester.h @@ -299,7 +299,7 @@ void end_call(LinphoneCoreManager *m1, LinphoneCoreManager *m2); void disable_all_audio_codecs_except_one(LinphoneCore *lc, const char *mime, int rate); void disable_all_video_codecs_except_one(LinphoneCore *lc, const char *mime); stats * get_stats(LinphoneCore *lc); -bool_t transport_supported(LinphoneCore *lc, LinphoneTransportType transport); +bool_t transport_supported(LinphoneTransportType transport); LinphoneCoreManager *get_manager(LinphoneCore *lc); const char *liblinphone_tester_get_subscribe_content(void); const char *liblinphone_tester_get_notify_content(void); diff --git a/tester/log_collection_tester.c b/tester/log_collection_tester.c index 52a5d5133..fa339a710 100644 --- a/tester/log_collection_tester.c +++ b/tester/log_collection_tester.c @@ -290,8 +290,8 @@ static void logCollectionUploadStateChangedCb(LinphoneCore *lc, LinphoneCoreLogC } } static void upload_collected_traces() { - LinphoneCoreManager* marie = setup(TRUE); - if (transport_supported(marie->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* marie = setup(TRUE); int waiting = 100; LinphoneCoreVTable *v_table = linphone_core_v_table_new(); v_table->log_collection_upload_state_changed = logCollectionUploadStateChangedCb; @@ -312,8 +312,8 @@ static void upload_collected_traces() { linphone_core_compress_log_collection(marie->lc); linphone_core_upload_log_collection(marie->lc); BC_ASSERT_TRUE(wait_for(marie->lc,marie->lc,&marie->stat.number_of_LinphoneCoreLogCollectionUploadStateDelivered,2)); + collect_cleanup(marie); } - collect_cleanup(marie); } test_t log_collection_tests[] = { diff --git a/tester/message_tester.c b/tester/message_tester.c index 5c4fb73dc..c125dbc3f 100644 --- a/tester/message_tester.c +++ b/tester/message_tester.c @@ -441,8 +441,8 @@ bool_t compare_files(const char *path1, const char *path2) { } static void file_transfer_message(void) { - LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - if (transport_supported(marie->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); char* to; LinphoneChatRoom* chat_room; LinphoneChatMessage* message; @@ -506,15 +506,15 @@ static void file_transfer_message(void) { linphone_core_manager_destroy(pauline); ms_free(send_filepath); ms_free(receive_filepath); + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); } /* same than previous but with a 160 characters file */ #define SMALL_FILE_SIZE 160 static void small_file_transfer_message(void) { - LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - if (transport_supported(marie->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); int i; char* to; LinphoneChatRoom* chat_room; @@ -571,8 +571,8 @@ static void small_file_transfer_message(void) { linphone_content_unref(content); linphone_core_manager_destroy(pauline); + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); } #ifdef HAVE_LIME @@ -915,8 +915,8 @@ static void lime_text_message(void) { #endif /* HAVE_LIME */ static void file_transfer_message_io_error_upload(void) { - LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - if (transport_supported(marie->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); int i; char* to; LinphoneChatRoom* chat_room; @@ -978,15 +978,15 @@ static void file_transfer_message_io_error_upload(void) { linphone_content_unref(content); linphone_core_manager_destroy(pauline); + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); } #ifdef TEST_IS_BUGGED_NO_CALL_TO_IO_ERROR_CALLBACK static void file_transfer_message_io_error_download(void) { - LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - if (transport_supported(marie->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); int i; char* to; LinphoneChatRoom* chat_room; @@ -1047,14 +1047,14 @@ static void file_transfer_message_io_error_download(void) { sal_set_recv_error(marie->lc->sal, 0); linphone_core_manager_destroy(pauline); + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); } #endif static void file_transfer_message_upload_cancelled(void) { - LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - if (transport_supported(marie->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); int i; char* to; LinphoneChatRoom* chat_room; @@ -1111,8 +1111,8 @@ static void file_transfer_message_upload_cancelled(void) { linphone_content_unref(content); linphone_core_manager_destroy(pauline); + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); } static void file_transfer_message_download_cancelled(void) { @@ -1182,8 +1182,8 @@ static void file_transfer_message_download_cancelled(void) { } static void file_transfer_using_external_body_url(void) { - LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); - if (transport_supported(marie->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc"); char *to; LinphoneChatMessageCbs *cbs; LinphoneChatRoom *chat_room; @@ -1216,13 +1216,13 @@ static void file_transfer_using_external_body_url(void) { BC_ASSERT_TRUE(wait_for(pauline->lc, marie->lc, &pauline->stat.number_of_LinphoneMessageInProgress, 1)); ms_free(to); linphone_core_manager_destroy(pauline); + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); } static void file_transfer_message_two_messages() { - LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); - if (transport_supported(marie->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc"); char* to; LinphoneChatRoom* pauline_room; LinphoneChatMessage* message; @@ -1304,8 +1304,8 @@ static void file_transfer_message_two_messages() { linphone_core_manager_destroy(pauline); ms_free(send_filepath); ms_free(receive_filepath); + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); } static void text_message_with_send_error(void) { @@ -1444,8 +1444,8 @@ static void info_message_with_args(bool_t with_content) { if (linphone_content_get_buffer(content))BC_ASSERT_TRUE(strcmp((const char*)linphone_content_get_buffer(content),info_content)==0); BC_ASSERT_EQUAL(linphone_content_get_size(content),strlen(info_content), int, "%d"); } + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline); } @@ -1613,8 +1613,8 @@ static void history_range_full_test(){ history_message_count_helper(chatroom, -1, 3, 4); history_message_count_helper(chatroom, -2, 2, 3); history_message_count_helper(chatroom, -3, 1, 2); + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); linphone_address_destroy(jehan_addr); remove(tmp_db); } @@ -1672,8 +1672,8 @@ static void history_messages_count() { messages = linphone_chat_room_get_history_range(chatroom, 1265, 1260); BC_ASSERT_EQUAL(ms_list_size(messages), 1270-1265, int, "%d"); ms_list_free_with_data(messages, (void (*)(void*))linphone_chat_message_unref); + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); linphone_address_destroy(jehan_addr); remove(tmp_db); } diff --git a/tester/register_tester.c b/tester/register_tester.c index 4b7d4c8a8..e97bd63c2 100644 --- a/tester/register_tester.c +++ b/tester/register_tester.c @@ -294,13 +294,13 @@ static void simple_tcp_register_compatibility_mode(){ } static void simple_tls_register(){ - char route[256]; - LinphoneCoreManager* lcm = create_lcm(); - if (transport_supported(lcm->lc,LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + char route[256]; + LinphoneCoreManager* lcm = create_lcm(); sprintf(route,"sip:%s;transport=tls",test_route); register_with_refresh(lcm,FALSE,test_domain,route); + linphone_core_manager_destroy(lcm); } - linphone_core_manager_destroy(lcm); } @@ -458,14 +458,13 @@ static void authenticated_register_with_wrong_credentials_without_403() { authenticated_register_with_wrong_credentials_with_params("tester-no-403"); } static LinphoneCoreManager* configure_lcm(void) { - LinphoneCoreManager *lcm=linphone_core_manager_new2( "multi_account_rc", FALSE); - if (transport_supported(lcm->lc,LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager *lcm=linphone_core_manager_new2( "multi_account_rc", FALSE); stats *counters=&lcm->stat; BC_ASSERT_TRUE(wait_for(lcm->lc,lcm->lc,&counters->number_of_LinphoneRegistrationOk,ms_list_size(linphone_core_get_proxy_config_list(lcm->lc)))); BC_ASSERT_EQUAL(counters->number_of_LinphoneRegistrationFailed,0, int, "%d"); return lcm; } - linphone_core_manager_destroy(lcm); return NULL; } @@ -685,15 +684,14 @@ static void io_recv_error_retry_immediatly(){ } static void io_recv_error_late_recovery(){ - LinphoneCoreManager *lcm; - LinphoneCore* lc; - int register_ok; - stats* counters ; - int number_of_udp_proxy=0; - MSList* lcs; - - lcm=linphone_core_manager_new2( "multi_account_rc",FALSE); /*to make sure iterates are not call yet*/ - if (transport_supported(lcm->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager *lcm; + LinphoneCore* lc; + int register_ok; + stats* counters ; + int number_of_udp_proxy=0; + MSList* lcs; + lcm=linphone_core_manager_new2( "multi_account_rc",FALSE); /*to make sure iterates are not call yet*/ lc=lcm->lc; sal_set_refresher_retry_after(lc->sal,1000); counters=&lcm->stat; @@ -716,8 +714,8 @@ static void io_recv_error_late_recovery(){ sal_set_send_error(lc->sal, 0); BC_ASSERT_TRUE(wait_for_list(lcs=ms_list_append(NULL,lc),&counters->number_of_LinphoneRegistrationOk,register_ok-number_of_udp_proxy +register_ok,sal_get_refresher_retry_after(lc->sal)+3000)); + linphone_core_manager_destroy(lcm); } - linphone_core_manager_destroy(lcm); } static void io_recv_error_without_active_register(){ @@ -761,13 +759,13 @@ static void io_recv_error_without_active_register(){ static void tls_certificate_failure(){ - LinphoneCoreManager* lcm; - LinphoneCore *lc; - char rootcapath[256]; + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* lcm; + LinphoneCore *lc; + char rootcapath[256]; - lcm=linphone_core_manager_new2("pauline_rc",FALSE); - lc=lcm->lc; - if (transport_supported(lc,LinphoneTransportTls)) { + lcm=linphone_core_manager_new2("pauline_rc",FALSE); + lc=lcm->lc; snprintf(rootcapath,sizeof(rootcapath), "%s/certificates/cn/agent.pem", bc_tester_read_dir_prefix); /*bad root ca*/ linphone_core_set_root_ca(lcm->lc,rootcapath); linphone_core_set_network_reachable(lc,TRUE); @@ -780,21 +778,21 @@ static void tls_certificate_failure(){ linphone_core_refresh_registers(lcm->lc); BC_ASSERT_TRUE(wait_for(lc,lc,&lcm->stat.number_of_LinphoneRegistrationOk,1)); BC_ASSERT_EQUAL(lcm->stat.number_of_LinphoneRegistrationFailed,2, int, "%d"); + linphone_core_manager_destroy(lcm); } - linphone_core_manager_destroy(lcm); } /*the purpose of this test is to check that will not block the proxy config during SSL handshake for entire life in case of mistaken configuration*/ static void tls_with_non_tls_server(){ - LinphoneCoreManager *lcm; - LinphoneProxyConfig* proxy_cfg; - LinphoneAddress* addr; - char tmp[256]; - LinphoneCore *lc; + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager *lcm; + LinphoneProxyConfig* proxy_cfg; + LinphoneAddress* addr; + char tmp[256]; + LinphoneCore *lc; - lcm=linphone_core_manager_new2( "marie_rc", 0); - lc=lcm->lc; - if (transport_supported(lc,LinphoneTransportTls)) { + lcm=linphone_core_manager_new2( "marie_rc", 0); + lc=lcm->lc; sal_set_transport_timeout(lc->sal,3000); linphone_core_get_default_proxy(lc,&proxy_cfg); linphone_proxy_config_edit(proxy_cfg); @@ -805,42 +803,42 @@ static void tls_with_non_tls_server(){ linphone_proxy_config_done(proxy_cfg); linphone_address_destroy(addr); BC_ASSERT_TRUE(wait_for_until(lc,lc,&lcm->stat.number_of_LinphoneRegistrationFailed,1,5000)); + linphone_core_manager_destroy(lcm); } - linphone_core_manager_destroy(lcm); } static void tls_alt_name_register(){ - LinphoneCoreManager* lcm; - LinphoneCore *lc; - char rootcapath[256]; + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* lcm; + LinphoneCore *lc; + char rootcapath[256]; - lcm=linphone_core_manager_new2("pauline_alt_rc",FALSE); - lc=lcm->lc; - if (transport_supported(lc,LinphoneTransportTls)) { + lcm=linphone_core_manager_new2("pauline_alt_rc",FALSE); + lc=lcm->lc; snprintf(rootcapath,sizeof(rootcapath), "%s/certificates/cn/cafile.pem", bc_tester_read_dir_prefix); linphone_core_set_root_ca(lc,rootcapath); linphone_core_refresh_registers(lc); BC_ASSERT_TRUE(wait_for(lc,lc,&lcm->stat.number_of_LinphoneRegistrationOk,1)); BC_ASSERT_EQUAL(lcm->stat.number_of_LinphoneRegistrationFailed,0, int, "%d"); + linphone_core_manager_destroy(lcm); } - linphone_core_manager_destroy(lcm); } static void tls_wildcard_register(){ - LinphoneCoreManager* lcm; - LinphoneCore *lc; - char rootcapath[256]; + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* lcm; + LinphoneCore *lc; + char rootcapath[256]; - lcm=linphone_core_manager_new2("pauline_wild_rc",FALSE); - lc=lcm->lc; - if (transport_supported(lc,LinphoneTransportTls)) { + lcm=linphone_core_manager_new2("pauline_wild_rc",FALSE); + lc=lcm->lc; snprintf(rootcapath,sizeof(rootcapath), "%s/certificates/cn/cafile.pem", bc_tester_read_dir_prefix); linphone_core_set_root_ca(lc,rootcapath); linphone_core_refresh_registers(lc); BC_ASSERT_TRUE(wait_for(lc,lc,&lcm->stat.number_of_LinphoneRegistrationOk,2)); BC_ASSERT_EQUAL(lcm->stat.number_of_LinphoneRegistrationFailed,0, int, "%d"); + linphone_core_manager_destroy(lcm); } - linphone_core_manager_destroy(lcm); } static void redirect(){ diff --git a/tester/remote_provisioning_tester.c b/tester/remote_provisioning_tester.c index cd4e19536..19ca62c89 100644 --- a/tester/remote_provisioning_tester.c +++ b/tester/remote_provisioning_tester.c @@ -58,12 +58,12 @@ static void remote_provisioning_transient(void) { } static void remote_provisioning_https(void) { - LinphoneCoreManager* marie = linphone_core_manager_new2("marie_remote_https_rc", FALSE); - if (transport_supported(marie->lc, LinphoneTransportTls)) { + if (transport_supported(LinphoneTransportTls)) { + LinphoneCoreManager* marie = linphone_core_manager_new2("marie_remote_https_rc", FALSE); BC_ASSERT_TRUE(wait_for(marie->lc,NULL,&marie->stat.number_of_LinphoneConfiguringSuccessful,1)); BC_ASSERT_TRUE(wait_for(marie->lc,NULL,&marie->stat.number_of_LinphoneRegistrationOk,1)); + linphone_core_manager_destroy(marie); } - linphone_core_manager_destroy(marie); } static void remote_provisioning_not_found(void) { diff --git a/tester/tester.c b/tester/tester.c index 1a56f6479..092621261 100644 --- a/tester/tester.c +++ b/tester/tester.c @@ -225,8 +225,9 @@ LinphoneCoreManager *get_manager(LinphoneCore *lc){ return manager; } -bool_t transport_supported(LinphoneCore *lc, LinphoneTransportType transport) { - bool_t supported = linphone_core_sip_transport_supported(lc, transport); +bool_t transport_supported(LinphoneTransportType transport) { + Sal *sal = sal_init(); + bool_t supported = sal_transport_available(sal,(SalTransport)transport); if (!supported) ms_warning("TLS transport not supported, falling back to TCP if possible otherwise skipping test."); return supported; } @@ -287,7 +288,7 @@ LinphoneCoreManager* linphone_core_manager_init(const char* rc_file) { char hellopath[512]; char *recordpath = ms_strdup_printf("%s/record_for_lc_%p.wav",bc_tester_writable_dir_prefix,mgr->lc); ms_message("Manager for '%s' using files", rc_file ? rc_file : "--"); - linphone_core_use_files(mgr->lc, TRUE); + linphone_core_set_use_files(mgr->lc, TRUE); snprintf(hellopath,sizeof(hellopath), "%s/sounds/hello8000.wav", bc_tester_read_dir_prefix); linphone_core_set_play_file(mgr->lc,hellopath); linphone_core_set_record_file(mgr->lc,recordpath);