From 9633a35601433a216741827f885827031e6823f6 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 19 Jun 2013 11:53:42 +0200
Subject: [PATCH] simplify tester
---
scripts/mk-ca-bundle.pl | 2 +-
tester/call_tester.c | 92 ++++++++++++++++++-------------------
tester/eventapi_tester.c | 8 ++--
tester/liblinphone_tester.c | 8 ++--
tester/liblinphone_tester.h | 4 +-
tester/message_tester.c | 28 +++++------
tester/presence_tester.c | 6 +--
tester/register_tester.c | 14 +++---
tester/upnp_tester.c | 6 +--
9 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/scripts/mk-ca-bundle.pl b/scripts/mk-ca-bundle.pl
index edede42612..283ebd13cd 100755
--- a/scripts/mk-ca-bundle.pl
+++ b/scripts/mk-ca-bundle.pl
@@ -36,7 +36,7 @@ use LWP::UserAgent;
use strict;
use vars qw($opt_b $opt_f $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v $opt_w);
-my $url = 'http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1';
+my $url = 'https://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1';
# If the OpenSSL commandline is not in search path you can configure it here!
my $openssl = 'openssl';
diff --git a/tester/call_tester.c b/tester/call_tester.c
index ddfde89904..d7f4ae0d65 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -162,8 +162,8 @@ bool_t call(LinphoneCoreManager* caller_mgr,LinphoneCoreManager* callee_mgr){
}
static void simple_call(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneCore* lc_marie=marie->lc;
LinphoneCore* lc_pauline=pauline->lc;
@@ -213,8 +213,8 @@ static void simple_call(void) {
static void simple_call_compatibility_mode(void) {
char route[256];
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneCore* lc_marie=marie->lc;
LinphoneCore* lc_pauline=pauline->lc;
@@ -279,8 +279,8 @@ static void simple_call_compatibility_mode(void) {
static void cancelled_call(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneCall* out_call = linphone_core_invite(pauline->lc,"marie");
linphone_call_ref(out_call);
@@ -299,7 +299,7 @@ static void cancelled_call(void) {
}
static void call_with_dns_time_out(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new2(liblinphone_tester_file_prefix, "empty_rc", FALSE);
+ LinphoneCoreManager* marie = linphone_core_manager_new2( "empty_rc", FALSE);
LCSipTransports transport = {9773,0,0,0};
linphone_core_set_sip_transports(marie->lc,&transport);
linphone_core_iterate(marie->lc);
@@ -315,8 +315,8 @@ static void call_with_dns_time_out(void) {
}
static void cancelled_ringing_call(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneCall* out_call = linphone_core_invite(pauline->lc,"marie");
linphone_call_ref(out_call);
@@ -334,8 +334,8 @@ static void cancelled_ringing_call(void) {
}
static void early_declined_call(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneCallLog* in_call;
LinphoneCall* out_call;
@@ -358,8 +358,8 @@ static void early_declined_call(void) {
}
static void call_declined(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneCall* in_call;
LinphoneCall* out_call = linphone_core_invite(pauline->lc,"marie");
@@ -383,8 +383,8 @@ static void call_declined(void) {
}
static void call_terminated_by_caller(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
CU_ASSERT_TRUE(call(pauline,marie));
/*just to sleep*/
@@ -397,8 +397,8 @@ static void call_terminated_by_caller(void) {
}
static void call_with_no_sdp(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_no_sdp_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_no_sdp_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
CU_ASSERT_TRUE(call(marie,pauline));
/*just to sleep*/
@@ -436,8 +436,8 @@ static bool_t check_ice(LinphoneCoreManager* caller, LinphoneCoreManager* callee
return success;
}
static void call_with_ice(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
linphone_core_set_firewall_policy(marie->lc,LinphonePolicyUseIce);
linphone_core_set_stun_server(marie->lc,"stun.linphone.org");
@@ -461,8 +461,8 @@ static void call_with_ice(void) {
}
static void call_with_custom_headers(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneCall *c1,*c2;
LinphoneCallParams *params;
const LinphoneCallParams *remote_params;
@@ -498,8 +498,8 @@ static void call_with_custom_headers(void) {
}
static void call_paused_resumed(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneCall* call_obj;
CU_ASSERT_TRUE(call(pauline,marie));
@@ -536,8 +536,8 @@ static bool_t pause_call_1(LinphoneCoreManager* mgr_1,LinphoneCall* call_1,Linph
}
static void call_paused_resumed_from_callee(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneCall* call_obj;
CU_ASSERT_TRUE(call(pauline,marie));
@@ -595,8 +595,8 @@ static bool_t add_video(LinphoneCoreManager* caller,LinphoneCoreManager* callee)
}
static void call_with_video_added(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
CU_ASSERT_TRUE(call(pauline,marie));
CU_ASSERT_TRUE(add_video(pauline,marie));
@@ -612,8 +612,8 @@ static void call_with_video_added(void) {
#endif
static void call_with_privacy(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneCall *c1,*c2;
LinphoneCallParams *params;
LinphoneProxyConfig* pauline_proxy;
@@ -670,9 +670,9 @@ static void call_with_privacy(void) {
static void simple_conference(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
- LinphoneCoreManager* laure = linphone_core_manager_new(liblinphone_tester_file_prefix, "laure_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+ LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
stats initial_marie_stat;
stats initial_pauline_stat;
stats initial_laure_stat;
@@ -728,8 +728,8 @@ static void simple_conference(void) {
static void srtp_call(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
if (linphone_core_media_encryption_supported(marie->lc,LinphoneMediaEncryptionSRTP)) {
linphone_core_set_media_encryption(marie->lc,LinphoneMediaEncryptionSRTP);
@@ -751,8 +751,8 @@ static void srtp_call(void) {
linphone_core_manager_destroy(pauline);
}
static void call_with_declined_srtp(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
if (linphone_core_media_encryption_supported(marie->lc,LinphoneMediaEncryptionSRTP)) {
linphone_core_set_media_encryption(pauline->lc,LinphoneMediaEncryptionSRTP);
@@ -774,8 +774,8 @@ static void srtp_video_ice_call(void) {
static void srtp_ice_call(void) {
#endif
int i=0;
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
if (linphone_core_media_encryption_supported(marie->lc,LinphoneMediaEncryptionSRTP)) {
linphone_core_set_media_encryption(marie->lc,LinphoneMediaEncryptionSRTP);
@@ -817,8 +817,8 @@ static void srtp_ice_call(void) {
static void early_media_call(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_early_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_early_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
CU_ASSERT_TRUE(call(pauline,marie));
@@ -834,9 +834,9 @@ static void early_media_call(void) {
}
static void simple_call_transfer(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
- LinphoneCoreManager* laure = linphone_core_manager_new(liblinphone_tester_file_prefix, "laure_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+ LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
LinphoneCall* pauline_called_by_marie;
char* laure_identity=linphone_address_as_string(laure->identity);
@@ -883,9 +883,9 @@ static void simple_call_transfer(void) {
}
static void call_transfer_existing_call_outgoing_call(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
- LinphoneCoreManager* laure = linphone_core_manager_new(liblinphone_tester_file_prefix, "laure_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
+ LinphoneCoreManager* laure = linphone_core_manager_new( "laure_rc");
LinphoneCall* marie_call_pauline;
LinphoneCall* pauline_called_by_marie;
diff --git a/tester/eventapi_tester.c b/tester/eventapi_tester.c
index c8571c8b6e..9e3e15a36a 100644
--- a/tester/eventapi_tester.c
+++ b/tester/eventapi_tester.c
@@ -77,8 +77,8 @@ void linphone_subscription_state_change(LinphoneCore *lc, LinphoneEvent *lev, Li
}
static void subscribe_test_declined(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneContent content;
MSList* lcs=ms_list_append(NULL,marie->lc);
lcs=ms_list_append(lcs,pauline->lc);
@@ -104,8 +104,8 @@ static void subscribe_test_declined(void) {
static void subscribe_test_with_args(bool_t terminated_by_subscriber) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneContent content;
LinphoneEvent *lev;
MSList* lcs=ms_list_append(NULL,marie->lc);
diff --git a/tester/liblinphone_tester.c b/tester/liblinphone_tester.c
index 9f9efc237f..40e1f1b2db 100644
--- a/tester/liblinphone_tester.c
+++ b/tester/liblinphone_tester.c
@@ -167,7 +167,7 @@ LinphoneCoreManager *get_manager(LinphoneCore *lc){
return manager;
}
-LinphoneCoreManager* linphone_core_manager_new2(const char* path, const char* rc_file, int check_for_proxies) {
+LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_for_proxies) {
LinphoneCoreManager* mgr= ms_new0(LinphoneCoreManager,1);
LinphoneProxyConfig* proxy;
int proxy_count=check_for_proxies?(rc_file?1:0):0;
@@ -185,7 +185,7 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* path, const char* rc
mgr->v_table.info_received=info_message_received;
mgr->v_table.subscription_state_changed=linphone_subscription_state_change;
mgr->v_table.notify_received=linphone_notify_received;
- mgr->lc=configure_lc_from(&mgr->v_table, path, rc_file);
+ mgr->lc=configure_lc_from(&mgr->v_table, liblinphone_tester_file_prefix, rc_file);
linphone_core_set_user_data(mgr->lc,mgr);
reset_counters(&mgr->stat);
/*CU_ASSERT_EQUAL(ms_list_size(linphone_core_get_proxy_config_list(lc)),proxy_count);*/
@@ -205,8 +205,8 @@ LinphoneCoreManager* linphone_core_manager_new2(const char* path, const char* rc
return mgr;
}
-LinphoneCoreManager* linphone_core_manager_new(const char* path, const char* rc_file) {
- return linphone_core_manager_new2(path, rc_file, TRUE);
+LinphoneCoreManager* linphone_core_manager_new( const char* rc_file) {
+ return linphone_core_manager_new2(rc_file, TRUE);
}
void linphone_core_manager_stop(LinphoneCoreManager *mgr){
diff --git a/tester/liblinphone_tester.h b/tester/liblinphone_tester.h
index 434c6a0a9a..9e98850c72 100644
--- a/tester/liblinphone_tester.h
+++ b/tester/liblinphone_tester.h
@@ -156,8 +156,8 @@ typedef struct _LinphoneCoreManager {
bool_t decline_subscribe;
} LinphoneCoreManager;
-LinphoneCoreManager* linphone_core_manager_new2(const char* path, const char* rc_file, int check_for_proxies);
-LinphoneCoreManager* linphone_core_manager_new(const char * path, const char* rc_file);
+LinphoneCoreManager* linphone_core_manager_new2(const char* rc_file, int check_for_proxies);
+LinphoneCoreManager* linphone_core_manager_new(const char* rc_file);
void linphone_core_manager_stop(LinphoneCoreManager *mgr);
void linphone_core_manager_destroy(LinphoneCoreManager* mgr);
diff --git a/tester/message_tester.c b/tester/message_tester.c
index a56e9676a5..33536ff7f0 100644
--- a/tester/message_tester.c
+++ b/tester/message_tester.c
@@ -62,8 +62,8 @@ void linphone_chat_message_state_change(LinphoneChatMessage* msg,LinphoneChatMes
}
static void text_message(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
char* to = linphone_address_as_string(marie->identity);
LinphoneChatRoom* chat_room = linphone_core_create_chat_room(pauline->lc,to);
@@ -80,8 +80,8 @@ static void text_message(void) {
}
static void text_message_with_privacy(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneProxyConfig* pauline_proxy;
char* to = linphone_address_as_string(marie->identity);
LinphoneChatRoom* chat_room = linphone_core_create_chat_room(pauline->lc,to);
@@ -103,8 +103,8 @@ static void text_message_with_privacy(void) {
static void text_message_compatibility_mode(void) {
char route[256];
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneProxyConfig* proxy;
LinphoneAddress* proxy_address;
char*tmp;
@@ -141,8 +141,8 @@ static void text_message_compatibility_mode(void) {
}
static void text_message_with_ack(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
char* to = linphone_address_as_string(marie->identity);
LinphoneChatRoom* chat_room = linphone_core_create_chat_room(pauline->lc,to);
LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
@@ -155,8 +155,8 @@ static void text_message_with_ack(void) {
}
static void text_message_with_external_body(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
char* to = linphone_address_as_string(marie->identity);
LinphoneChatRoom* chat_room = linphone_core_create_chat_room(pauline->lc,to);
LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
@@ -172,8 +172,8 @@ static void text_message_with_external_body(void) {
}
static void text_message_with_send_error(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
char* to = linphone_address_as_string(pauline->identity);
LinphoneChatRoom* chat_room = linphone_core_create_chat_room(marie->lc,to);
LinphoneChatMessage* message = linphone_chat_room_create_message(chat_room,"Bli bli bli \n blu");
@@ -216,8 +216,8 @@ void info_message_received(LinphoneCore *lc, LinphoneCall* call, const LinphoneI
static void info_message_with_args(bool_t with_content) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
- LinphoneCoreManager* pauline = linphone_core_manager_new(liblinphone_tester_file_prefix, "pauline_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
+ LinphoneCoreManager* pauline = linphone_core_manager_new( "pauline_rc");
LinphoneInfoMessage *info;
CU_ASSERT_TRUE(call(pauline,marie));
diff --git a/tester/presence_tester.c b/tester/presence_tester.c
index 543caccbe2..c6919bbdf2 100644
--- a/tester/presence_tester.c
+++ b/tester/presence_tester.c
@@ -23,7 +23,7 @@
#include "liblinphone_tester.h"
static LinphoneCoreManager* presence_linphone_core_manager_new(char* username) {
- LinphoneCoreManager* mgr= linphone_core_manager_new2(liblinphone_tester_file_prefix, "empty_rc", FALSE);
+ LinphoneCoreManager* mgr= linphone_core_manager_new2( "empty_rc", FALSE);
char* identity_char;
mgr->identity= linphone_core_get_primary_contact_parsed(mgr->lc);
linphone_address_set_username(mgr->identity,username);
@@ -68,7 +68,7 @@ void notify_presence_received(LinphoneCore *lc, LinphoneFriend * lf) {
}
static void simple_publish(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
LinphoneProxyConfig* proxy;
int i=0;
linphone_core_get_default_proxy(marie->lc,&proxy);
@@ -124,7 +124,7 @@ static void simple_subscribe(void) {
}
static void unsubscribe_while_subscribing(void) {
- LinphoneCoreManager* marie = linphone_core_manager_new(liblinphone_tester_file_prefix, "marie_rc");
+ LinphoneCoreManager* marie = linphone_core_manager_new( "marie_rc");
LinphoneFriend* friend = linphone_friend_new_with_addr("sip:toto@git.linphone.org"); /*any unexisting address*/
linphone_friend_edit(friend);
linphone_friend_enable_subscribes(friend,TRUE);
diff --git a/tester/register_tester.c b/tester/register_tester.c
index d7dafb76ff..0263a45679 100644
--- a/tester/register_tester.c
+++ b/tester/register_tester.c
@@ -23,7 +23,7 @@
#include "liblinphone_tester.h"
static LinphoneCoreManager* create_lcm_with_auth(unsigned int with_auth) {
- LinphoneCoreManager* mgr=linphone_core_manager_new(NULL,NULL);
+ LinphoneCoreManager* mgr=linphone_core_manager_new(NULL);
if (with_auth) {
mgr->lc->vtable.auth_info_requested=auth_info_requested;
@@ -238,7 +238,7 @@ static void authenticated_register_with_no_initial_credentials(){
sprintf(route,"sip:%s",test_route);
- mgr = linphone_core_manager_new(NULL,NULL);
+ mgr = linphone_core_manager_new(NULL);
counters= get_stats(mgr->lc);
counters->number_of_auth_info_requested=0;
@@ -264,7 +264,7 @@ static void authenticated_register_with_late_credentials(){
sprintf(route,"sip:%s",test_route);
- mgr = linphone_core_manager_new(NULL,NULL);
+ mgr = linphone_core_manager_new(NULL);
mgr->lc->vtable.auth_info_requested=auth_info_requested2;
counters = get_stats(mgr->lc);
register_with_refresh_base_2(mgr->lc,FALSE,auth_domain,route,TRUE,transport);
@@ -281,7 +281,7 @@ static void authenticated_register_with_wrong_credentials(){
sprintf(route,"sip:%s",test_route);
- mgr=linphone_core_manager_new(NULL,NULL);
+ mgr=linphone_core_manager_new(NULL);
mgr->lc->vtable.auth_info_requested=auth_info_requested2;
linphone_core_add_auth_info(mgr->lc,info); /*add wrong authentication info to LinphoneCore*/
@@ -292,7 +292,7 @@ static void authenticated_register_with_wrong_credentials(){
}
static LinphoneCoreManager* configure_lcm(void) {
- LinphoneCoreManager *mgr=linphone_core_manager_new( liblinphone_tester_file_prefix, "multi_account_lrc");
+ LinphoneCoreManager *mgr=linphone_core_manager_new( "multi_account_lrc");
stats *counters=&mgr->stat;
CU_ASSERT_TRUE(wait_for(mgr->lc,mgr->lc,&counters->number_of_LinphoneRegistrationOk,ms_list_size(linphone_core_get_proxy_config_list(mgr->lc))));
return mgr;
@@ -424,7 +424,7 @@ static void tls_certificate_failure(){
LinphoneCore *lc;
char rootcapath[256];
- mgr=linphone_core_manager_new2(liblinphone_tester_file_prefix, "pauline_rc",FALSE);
+ mgr=linphone_core_manager_new2("pauline_rc",FALSE);
lc=mgr->lc;
snprintf(rootcapath,sizeof(rootcapath), "%s/certificates/agent.pem", liblinphone_tester_file_prefix); /*bad root ca*/
linphone_core_set_root_ca(mgr->lc,rootcapath);
@@ -448,7 +448,7 @@ static void tls_with_non_tls_server(){
char tmp[256];
LinphoneCore *lc;
- mgr=linphone_core_manager_new2(liblinphone_tester_file_prefix, "marie_rc", 0);
+ mgr=linphone_core_manager_new2( "marie_rc", 0);
lc=mgr->lc;
linphone_core_get_default_proxy(lc,&proxy_cfg);
linphone_proxy_config_edit(proxy_cfg);
diff --git a/tester/upnp_tester.c b/tester/upnp_tester.c
index f407808ac0..8b1d13e1dc 100644
--- a/tester/upnp_tester.c
+++ b/tester/upnp_tester.c
@@ -25,7 +25,7 @@
static void upnp_start_n_stop(void) {
int tmp = 0;
- LinphoneCoreManager* lc_upnp = linphone_core_manager_new2(liblinphone_tester_file_prefix, "upnp_rc", FALSE);
+ LinphoneCoreManager* lc_upnp = linphone_core_manager_new2( "upnp_rc", FALSE);
wait_for(lc_upnp->lc,lc_upnp->lc,&tmp,1);
#ifdef BUILD_UPNP
CU_ASSERT_TRUE(lc_upnp->lc->upnp != NULL);
@@ -35,7 +35,7 @@ static void upnp_start_n_stop(void) {
static void upnp_check_state(void) {
int tmp = 0;
- LinphoneCoreManager* lc_upnp = linphone_core_manager_new2(liblinphone_tester_file_prefix, "upnp_rc", FALSE);
+ LinphoneCoreManager* lc_upnp = linphone_core_manager_new2( "upnp_rc", FALSE);
wait_for(lc_upnp->lc,lc_upnp->lc,&tmp,1);
CU_ASSERT_TRUE(linphone_core_get_upnp_state(lc_upnp->lc) == LinphoneUpnpStateOk);
linphone_core_manager_destroy(lc_upnp);
@@ -43,7 +43,7 @@ static void upnp_check_state(void) {
static void upnp_check_ipaddress(void) {
int tmp = 0;
- LinphoneCoreManager* lc_upnp = linphone_core_manager_new2(liblinphone_tester_file_prefix, "upnp_rc", FALSE);
+ LinphoneCoreManager* lc_upnp = linphone_core_manager_new2( "upnp_rc", FALSE);
wait_for(lc_upnp->lc,lc_upnp->lc,&tmp,1);
const char *addr = linphone_core_get_upnp_external_ipaddress(lc_upnp->lc);
CU_ASSERT_TRUE(addr != NULL && strlen(addr)>=7);
--
GitLab