Commit 5904e987 authored by Matthieu Tanon's avatar Matthieu Tanon

Use default xmlrpc and x3dh server urls

parent 9c909cae
......@@ -129,7 +129,12 @@ LimeX3dhEncryptionEngine::LimeX3dhEncryptionEngine (
auto cCore = core->getCCore();
limeManager = unique_ptr<LimeManager>(new LimeManager(dbAccess, prov, core));
lastLimeUpdate = linphone_config_get_int(cCore->config, "lime", "last_update_time", 0);
x3dhServerUrl = linphone_config_get_string(linphone_core_get_config(cCore), "lime", "x3dh_server_url", "");
x3dhServerUrl = linphone_config_get_string(
linphone_core_get_config(cCore),
"lime",
"x3dh_server_url",
"http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php"
);
if (x3dhServerUrl.empty())
lError() << "LIME X3DH server URL unavailable for encryption engine";
}
......
......@@ -348,7 +348,12 @@ static LinphoneAddress *account_manager_check_account(AccountManager *m, Linphon
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", "http://subscribe.example.org/flexisip-account-manager/xmlrpc.php");
const char *xmlrpc_url = linphone_config_get_string(
linphone_core_get_config(lc),
"misc",
"xmlrpc_server_url",
"http://subscribe.example.org/flexisip-account-manager/xmlrpc.php"
);
account_create_in_db(account, cfg, xmlrpc_url);
}
}
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[lime]
lime_v2=1
x3dh_server_url=http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php
x3dh_db_path=chloe.x3dh.sqlite3
lime_update_threshold=86400
max_nb_device_per_participant=1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[lime]
lime_v2=1
x3dh_server_url=http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php
x3dh_db_path=laure.x3dh.sqlite3
lime_update_threshold=86400
max_nb_device_per_participant=1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[lime]
lime_v2=0
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/mtanon/tools/wizard_and_remote_provisioning_php_scripts/xmlrpc.php
x3dh_server_url=https://shuttle-debian8/mtanon/tools/wizard_and_remote_provisioning_php_scripts/x3dh-22519.php
lime_update_threshold=86400
[sip]
sip_port=-1
sip_tcp_port=-1
sip_tls_port=-1
default_proxy=0
ping_with_options=0
composing_idle_timeout=1
store_ha1_passwd=0 #used for sipp
[auth_info_0]
username=marie
userid=marie
passwd=secret
realm=sip.example.org
[proxy_0]
reg_proxy=sip.example.org;transport=tcp
reg_route=sip.example.org;transport=tcp;lr
reg_identity="Super Marie" <sip:marie@sip.example.org>
reg_expires=3600
reg_sendregister=1
publish=0
dial_escape_plus=0
[friend_0]
url="Paupoche" <sip:pauline@sip.example.org>
pol=accept
subscribe=0
[misc]
enable_basic_to_client_group_chat_room_migration=1
basic_to_client_group_chat_room_migration_timer=10
[rtp]
audio_rtp_port=18070-28000
video_rtp_port=28070-38000
text_rtp_port=39000-49000
[video]
display=0
capture=0
show_local=0
size=qcif
enabled=0
self_view=0
automatically_initiate=0
automatically_accept=0
device=StaticImage: Static picture
[sound]
echocancellation=0 #to not overload cpu in case of VG
[net]
dns_srv_enabled=0 #no srv needed in general
stun_server=stun.linphone.org
#leave this section, which is used by "Codec setup" test of "Setup" suite.
[video_codec_0]
mime=VP8
rate=90000
enabled=1
[misc]
enable_basic_to_client_group_chat_room_migration=1
basic_to_client_group_chat_room_migration_timer=180
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[lime]
lime_v2=1
x3dh_server_url=http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php
x3dh_db_path=marie.x3dh.sqlite3
lime_update_threshold=86400
max_nb_device_per_participant=1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
enable_basic_to_client_group_chat_room_migration=1
basic_to_client_group_chat_room_migration_timer=180
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[lime]
lime_v2=1
x3dh_server_url=http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php
x3dh_db_path=pauline.x3dh.sqlite3
lime_update_threshold=86400
max_nb_device_per_participant=1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
[misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[sip]
sip_port=-1
sip_tcp_port=-1
......
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