Commit 45f7dc4f authored by Matthieu Tanon's avatar Matthieu Tanon
Browse files

Move lime_v2 config parameter to [encryption]

parent 5c01b886
......@@ -143,7 +143,7 @@ static void linphone_proxy_config_init(LinphoneCore* lc, LinphoneProxyConfig *cf
cfg->avpf_rr_interval = lc ? !!lp_config_get_default_int(lc->config, "proxy", "avpf_rr_interval", 5) : 5;
cfg->publish_expires= lc ? lp_config_get_default_int(lc->config, "proxy", "publish_expires", -1) : -1;
cfg->publish = lc ? !!lp_config_get_default_int(lc->config, "proxy", "publish", FALSE) : FALSE;
cfg->lime_v2 = lc ? !!lp_config_get_default_int(lc->config, "proxy", "lime_v2", FALSE) : FALSE; // Disabled by default unless you have a lime_v2=1 in config
cfg->lime_v2 = lc ? !!lp_config_get_int(lc->config, "encryption", "lime_v2", FALSE) : FALSE; // Disabled by default unless you have a lime_v2=1 in config
cfg->push_notification_allowed = lc ? !!lp_config_get_default_int(lc->config, "proxy", "push_notification_allowed", TRUE) : TRUE;
cfg->refkey = refkey ? ms_strdup(refkey) : NULL;
if (nat_policy_ref) {
......
......@@ -2,6 +2,7 @@
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[encryption]
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
......@@ -30,7 +31,6 @@ reg_expires=3600
reg_sendregister=1
publish=0
dial_escape_plus=0
lime_v2=1
[rtp]
audio_rtp_port=18070-28000
......
......@@ -2,6 +2,7 @@
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[encryption]
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
......@@ -28,7 +29,6 @@ reg_expires=3600
reg_sendregister=1
publish=0
dial_escape_plus=0
lime_v2=1
[rtp]
audio_rtp_port=9010-9390
......
......@@ -4,6 +4,7 @@ basic_to_client_group_chat_room_migration_timer=180
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[encryption]
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
......@@ -32,7 +33,6 @@ reg_expires=3600
reg_sendregister=1
publish=0
dial_escape_plus=0
lime_v2=1
[friend_0]
url="Paupoche" <sip:pauline@sip.example.org>
......
......@@ -2,6 +2,7 @@
xmlrpc_server_url=http://subscribe.example.org/flexisip-account-manager/xmlrpc.php
[encryption]
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
......@@ -30,7 +31,6 @@ reg_expires=3600
reg_sendregister=1
publish=0
dial_escape_plus=0
lime_v2=1
#[friend_0]
#url="Mariette" <sip:marie@sip.example.org>
......
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