Commit 8ae88981 authored by Matthieu Tanon's avatar Matthieu Tanon

New option to launch testers with or without account creator

parent 97616f57
......@@ -339,7 +339,7 @@ static LinphoneAddress *account_manager_check_account(AccountManager *m, Linphon
account->phone_alias=ms_strdup(phone_alias);
ms_message("No account for %s exists, going to create one.",identity);
create_account=TRUE;
m->accounts=bctbx_list_append(m->accounts,account);
m->accounts=bctbx_list_append(m->accounts, account);
}
// modify the username of the identity of the proxy config
linphone_address_set_username(id_addr, linphone_address_get_username(account->modified_identity));
......@@ -347,8 +347,12 @@ static LinphoneAddress *account_manager_check_account(AccountManager *m, Linphon
// create account using account creator and flexisip-account-manager
if (create_account){
const char *xmlrpc_url = linphone_config_get_string(linphone_core_get_config(lc), "misc", "xmlrpc_server_url", "");
account_create_on_db(account,cfg,xmlrpc_url);
if (liblinphonetester_no_account_creator) {
account_create_on_server(account, cfg, phone_alias);
} else {
const char *xmlrpc_url = linphone_config_get_string(linphone_core_get_config(lc), "misc", "xmlrpc_server_url", "");
account_create_on_db(account,cfg,xmlrpc_url);
}
}
if (liblinphone_tester_keep_uuid) {
......
......@@ -206,6 +206,7 @@ static const char* liblinphone_helper =
"\t\t\t--disable-tls-support\n"
"\t\t\t--no-ipv6 (turn off IPv6 in LinphoneCore, tests requiring IPv6 will be skipped)\n"
"\t\t\t--show-account-manager-logs (show temporary test account creation logs)\n"
"\t\t\t--no-account-creator (use file database flexisip for account creation)\n"
;
int main (int argc, char *argv[])
......@@ -243,6 +244,8 @@ int main (int argc, char *argv[])
liblinphonetester_ipv6 = FALSE;
} else if (strcmp(argv[i],"--show-account-manager-logs")==0){
liblinphonetester_show_account_manager_logs=TRUE;
} else if (strcmp(argv[i],"--no-account-creator")==0){
liblinphonetester_no_account_creator=TRUE;
} else {
int bret = bc_tester_parse_args(argc, argv, i);
if (bret>0) {
......
......@@ -142,6 +142,7 @@ extern const char *liblinphone_tester_mire_id;
extern const char *liblinphone_tester_static_image_id;
extern bool_t liblinphonetester_ipv6;
extern bool_t liblinphonetester_show_account_manager_logs;
extern bool_t liblinphonetester_no_account_creator;
typedef struct _stats {
int number_of_LinphoneRegistrationNone;
......
......@@ -53,6 +53,7 @@ const char* test_route="sip2.linphone.org";
const char *userhostsfile = "tester_hosts";
bool_t liblinphonetester_ipv6 = TRUE;
bool_t liblinphonetester_show_account_manager_logs = FALSE;
bool_t liblinphonetester_no_account_creator = FALSE;
int liblinphonetester_transport_timeout = 9000; /*milliseconds. it is set to such low value to workaround a problem with our Freebox v6 when connecting to Ipv6 addresses.
It was found that the freebox sometimes block SYN-ACK packets, which prevents connection to be succesful.
Thanks to the timeout, it will fallback to IPv4*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment