do not use ICE while in tunnel mode

diff --git a/coreapi/TunnelManager.cc b/coreapi/TunnelManager.cc
index 2165a2bf452db65be59839acb532eeced14e218e..9b5dffd29c306bed85a946715eedd7e4f87dab90 100644 (file)
--- 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 6df99192a3fe22889dac58a019be71efbeff8158..d4c1458fcfc933c122b8cec44604fe298a974958 100644 (file)
--- 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 88b9146ccbd33c9d8d3317be92078f6211498907..bc1d91a891a04858b43d6e08fa1136d2c3b9c6a2 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 88b9146ccbd33c9d8d3317be92078f6211498907
+Subproject commit bc1d91a891a04858b43d6e08fa1136d2c3b9c6a2