Commit 42ff6ee8 authored by Matthieu Tanon's avatar Matthieu Tanon
Browse files

Testers now use X3DH db path paramter from rc files if there is one

parent 033a2472
...@@ -217,11 +217,13 @@ void Core::enableLimeV2 (bool enable) { ...@@ -217,11 +217,13 @@ void Core::enableLimeV2 (bool enable) {
LimeV2 *limeV2Engine; LimeV2 *limeV2Engine;
if (d->imee == nullptr) { if (d->imee == nullptr) {
const char *charPrefix = linphone_factory_get_data_resources_dir(linphone_factory_get()); LinphoneConfig *lpconfig = linphone_core_get_config(getCCore());
string stringPrefix(charPrefix); string filename = lp_config_get_string(lpconfig, "misc", "x3dh_db_path", "x3dh.c25519.sqlite3");
string db_access = stringPrefix + ".c25519.sqlite3"; string dbAccess = getDataPath() + filename;
belle_http_provider_t *prov = linphone_core_get_http_provider(getCCore()); belle_http_provider_t *prov = linphone_core_get_http_provider(getCCore());
limeV2Engine = new LimeV2(db_access, prov, getCCore()); limeV2Engine = new LimeV2(dbAccess, prov, getCCore());
setEncryptionEngine(limeV2Engine); setEncryptionEngine(limeV2Engine);
d->registerListener(limeV2Engine); d->registerListener(limeV2Engine);
} }
...@@ -240,7 +242,6 @@ void Core::enableLimeV2 (bool enable) { ...@@ -240,7 +242,6 @@ void Core::enableLimeV2 (bool enable) {
IdentityAddress identityAddress = IdentityAddress(linphone_address_as_string_uri_only(linphoneAddress)); IdentityAddress identityAddress = IdentityAddress(linphone_address_as_string_uri_only(linphoneAddress));
string localDeviceId = identityAddress.asString(); string localDeviceId = identityAddress.asString();
if (localDeviceId == "") if (localDeviceId == "")
return; return;
......
[misc] [misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
x3dh_server_url=http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php x3dh_server_url=http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php
x3dh_db_path=chloe.x3dh.sqlite3
lime_update_threshold=86400 lime_update_threshold=86400
[sip] [sip]
......
[misc] [misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
x3dh_server_url=http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php x3dh_server_url=http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php
x3dh_db_path=laure.x3dh.sqlite3
lime_update_threshold=86400 lime_update_threshold=86400
[sip] [sip]
......
...@@ -3,6 +3,7 @@ enable_basic_to_client_group_chat_room_migration=1 ...@@ -3,6 +3,7 @@ enable_basic_to_client_group_chat_room_migration=1
basic_to_client_group_chat_room_migration_timer=180 basic_to_client_group_chat_room_migration_timer=180
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
x3dh_server_url=http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php x3dh_server_url=http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php
x3dh_db_path=marie.x3dh.sqlite3
lime_update_threshold=86400 lime_update_threshold=86400
[sip] [sip]
......
[misc] [misc]
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
x3dh_server_url=http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php x3dh_server_url=http://x3dh.linphone.org/flexisip-account-manager/x3dh-25519.php
x3dh_db_path=pauline.x3dh.sqlite3
lime_update_threshold=86400 lime_update_threshold=86400
[sip] [sip]
......
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