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

fix tcp

Browse source
This commit is contained in:
Jehan Monnier 2011-07-01 12:03:38 +02:00
parent cabe7e0fb8
commit f7ebf6133e
4 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored Normal file
View file

@ -0,0 +1,5 @@
libs
obj
gen
bin
doc

BIN
libs/armeabi-v7a/liblinphone.so
View file

Binary file not shown.

BIN
libs/armeabi/liblinphone.so
View file

Binary file not shown.

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

@ -509,23 +509,30 @@ public final class LinphoneManager implements LinphoneCoreListener {
private void setSignalingTransportsFromConfiguration(Transports t) { private void setSignalingTransportsFromConfiguration(Transports t) {
Transports ports = new Transports(t); Transports ports = new Transports(t);
boolean useStandardPort = getBool(R.string.pref_transport_use_standard_ports_key, false); boolean useStandardPort = getBool(R.string.pref_transport_use_standard_ports_key, false);
int lPreviousPort = ports.tcp +ports.udp +ports.tls; // assume only one port is active
if (!getBool(R.string.pref_transport_udp_key, false)) {
ports.udp = 0;
} else if (useStandardPort) {
ports.udp = 5060;
}
if (!getBool(R.string.pref_transport_tcp_key, false)) { if (!getBool(R.string.pref_transport_tcp_key, false)) {
ports.tcp = 0; ports.tcp = 0;
} else if (useStandardPort) { } else if (useStandardPort) {
ports.tcp = 5060; ports.tcp = 5060;
} else if (ports.tcp==0){
ports.tcp=lPreviousPort;
}
if (!getBool(R.string.pref_transport_udp_key, false)) {
ports.udp = 0;
} else if (useStandardPort) {
ports.udp = 5060;
} else if (ports.udp==0) {
ports.udp = lPreviousPort;
} }
if (!getBool(R.string.pref_transport_tls_key, false)) { if (!getBool(R.string.pref_transport_tls_key, false)) {
ports.tls = 0; ports.tls = 0;
} else if (useStandardPort) { } else if (useStandardPort) {
ports.tls = 5060; ports.tls = 5060;
} else if (ports.tls==0) {
ports.tls=lPreviousPort;
} }
mLc.setSignalingTransportPorts(ports); mLc.setSignalingTransportPorts(ports);