From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 18 Sep 2012 10:24:31 +0000 (+0200)
Subject: do not use ICE while in tunnel mode
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=239e4f553b425ab09ac097b8b2cfbb4d75cf2047

do not use ICE while in tunnel mode
---

diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc
index 2165a2bf..9b5dffd2 100644
--- a/coreapi/TunnelManager.cc
+++ b/coreapi/TunnelManager.cc
@@ -246,7 +246,8 @@ void TunnelManager::processTunnelEvent(const Event &ev){
 	linphone_core_get_default_proxy(mCore, &lProxy);
 
 	if (mEnabled && mTunnelClient->isReady()){
-		ms_message("Tunnel is up, registering now");		
+		ms_message("Tunnel is up, registering now");
+		linphone_core_set_firewall_policy(mCore,LinphonePolicyNoFirewall);
 		linphone_core_set_rtp_transport_factories(mCore,&mTransportFactories);
 		eXosip_transport_hook_register(&mExosipTransport);
 		//force transport to udp
@@ -295,8 +296,9 @@ void TunnelManager::enable(bool isEnable) {
 	ms_message("Turning tunnel [%s]",(isEnable?"on":"off"));
 	if (isEnable && !mEnabled){
 		mEnabled=true;
-		//1 save transport 
+		//1 save transport and firewall policy
 		linphone_core_get_sip_transports(mCore, &mRegularTransport);
+		mPreviousFirewallPolicy=linphone_core_get_firewall_policy(mCore);
 		//2 unregister
 		waitUnRegistration();
 		//3 insert tunnel
@@ -311,8 +313,9 @@ void TunnelManager::enable(bool isEnable) {
 		linphone_core_set_rtp_transport_factories(mCore,NULL);
 
 		eXosip_transport_hook_register(NULL);
-		//Restore transport
+		//Restore transport and firewall policy
 		linphone_core_set_sip_transports(mCore, &mRegularTransport);
+		linphone_core_set_firewall_policy(mCore, mPreviousFirewallPolicy);
 		//register
 		LinphoneProxyConfig* lProxy;
 		linphone_core_get_default_proxy(mCore, &lProxy);
diff --git a/coreapi/TunnelManager.hh b/coreapi/TunnelManager.hh
index 6df99192..d4c1458f 100644
--- a/coreapi/TunnelManager.hh
+++ b/coreapi/TunnelManager.hh
@@ -178,6 +178,7 @@ class UdpMirrorClient;
 		std::string mHttpPasswd;
 		std::string mHttpProxyHost;
 		int mHttpProxyPort;
+		LinphoneFirewallPolicy mPreviousFirewallPolicy;
 	};
 
 /**
diff --git a/mediastreamer2 b/mediastreamer2
index 88b9146c..bc1d91a8 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 88b9146ccbd33c9d8d3317be92078f6211498907
+Subproject commit bc1d91a891a04858b43d6e08fa1136d2c3b9c6a2