From 7fe891b4ae172340cb6f62ce34e0f56543ecbc5e Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Sat, 27 Dec 2014 19:45:19 +0100 Subject: [PATCH] add ice option to enable backward compatibility with previous version of ice --- coreapi/linphonecall.c | 4 ++++ mediastreamer2 | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index c5c7e6a7a..0f2f02383 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -737,6 +737,8 @@ LinphoneCall * linphone_call_new_outgoing(struct _LinphoneCore *lc, LinphoneAddr if (linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseIce) { call->ice_session = ice_session_new(); + /*for backward compatibility purposes, shall be enabled by default in futur*/ + ice_session_enable_message_integrity_check(call->ice_session,lp_config_get_int(lc->config,"net","ice_session_enable_message_integrity_check",0)); ice_session_set_role(call->ice_session, IR_Controlling); } if (linphone_core_get_firewall_policy(call->core) == LinphonePolicyUseStun) { @@ -846,6 +848,8 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro if (fpol==LinphonePolicyUseIce){ if (md){ call->ice_session = ice_session_new(); + /*for backward compatibility purposes, shall be enabled by default in futur*/ + ice_session_enable_message_integrity_check(call->ice_session,lp_config_get_int(lc->config,"net","ice_session_enable_message_integrity_check",0)); ice_session_set_role(call->ice_session, IR_Controlled); }else{ fpol=LinphonePolicyNoFirewall; diff --git a/mediastreamer2 b/mediastreamer2 index 87cf71d76..08ed3f8a6 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 87cf71d765ae035ad5a1b6bdcaf2970410459c2d +Subproject commit 08ed3f8a65ad830baa1023e5c0d3ec9e5421ef32