From 49da56dddef80fb7e8ed05d8ce11a6a33f1df8bb Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 29 Apr 2013 22:32:57 +0200 Subject: [PATCH] update linphone and belle-sip submodules for bugfixes. fix bug making ICE impossible to use. --- res/raw/linphonerc | 1 - src/org/linphone/LinphoneManager.java | 2 +- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/res/raw/linphonerc b/res/raw/linphonerc index fd689d43b..f51475648 100644 --- a/res/raw/linphonerc +++ b/res/raw/linphonerc @@ -1,7 +1,6 @@ [net] download_bw=380 upload_bw=380 -firewall_policy=0 mtu=1300 [sip] diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 5f733fe61..fdec64407 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -869,7 +869,7 @@ public final class LinphoneManager implements LinphoneCoreListener { if (lStun!=null && lStun.length()>0 && useICE) { mLc.setFirewallPolicy(FirewallPolicy.UseIce); if (useUpnp) Log.e("Cannot have both ice and upnp enabled, disabling upnp"); - } if (useUpnp) { + } else if (useUpnp) { mLc.setFirewallPolicy(FirewallPolicy.UseUpnp); } else if (lStun!=null && lStun.length()>0){ mLc.setFirewallPolicy(FirewallPolicy.UseStun); diff --git a/submodules/belle-sip b/submodules/belle-sip index 414af68e2..14a26b786 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 414af68e2f21ac741b123751c0e1f5ba45354b14 +Subproject commit 14a26b786761557a30964efcdfe8385a75884cfb diff --git a/submodules/linphone b/submodules/linphone index 0e9b41562..1098142ac 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 0e9b41562fe6c6f3629be3a3c61d12a2ab07e11e +Subproject commit 1098142ac18706c1cb65220415ab4debffce8dd3