Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update linphone and belle-sip submodules for bugfixes.

Browse source 
fix bug making ICE impossible to use.
This commit is contained in:
Simon Morlat 2013-04-29 22:32:57 +02:00
parent 8a99c4d15c
commit 49da56ddde
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/raw/linphonerc
View file

@ -1,7 +1,6 @@
[net] [net]
download_bw=380 download_bw=380
upload_bw=380 upload_bw=380
firewall_policy=0
mtu=1300 mtu=1300
[sip] [sip]

2
src/org/linphone/LinphoneManager.java
View file

@ -869,7 +869,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
if (lStun!=null && lStun.length()>0 && useICE) { if (lStun!=null && lStun.length()>0 && useICE) {
mLc.setFirewallPolicy(FirewallPolicy.UseIce); mLc.setFirewallPolicy(FirewallPolicy.UseIce);
if (useUpnp) Log.e("Cannot have both ice and upnp enabled, disabling upnp"); if (useUpnp) Log.e("Cannot have both ice and upnp enabled, disabling upnp");
} if (useUpnp) { } else if (useUpnp) {
mLc.setFirewallPolicy(FirewallPolicy.UseUpnp); mLc.setFirewallPolicy(FirewallPolicy.UseUpnp);
} else if (lStun!=null && lStun.length()>0){ } else if (lStun!=null && lStun.length()>0){
mLc.setFirewallPolicy(FirewallPolicy.UseStun); mLc.setFirewallPolicy(FirewallPolicy.UseStun);

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 414af68e2f21ac741b123751c0e1f5ba45354b14 Subproject commit 14a26b786761557a30964efcdfe8385a75884cfb

2
submodules/linphone

@ -1 +1 @@
Subproject commit 0e9b41562fe6c6f3629be3a3c61d12a2ab07e11e Subproject commit 1098142ac18706c1cb65220415ab4debffce8dd3