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

update exosip

Browse source 
set tcp connection timout to 1s
This commit is contained in:
Jehan Monnier 2012-07-19 13:41:22 +02:00
parent af6fdb0b78
commit aa73594d2e
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -736,7 +736,10 @@ public final class LinphoneManager implements LinphoneCoreListener {
Transports ports = new Transports(t); Transports ports = new Transports(t);
boolean useStandardPort = getPrefBoolean(R.string.pref_transport_use_standard_ports_key, false); boolean useStandardPort = getPrefBoolean(R.string.pref_transport_use_standard_ports_key, false);
int lPreviousPort = ports.tcp +ports.udp +ports.tls; // assume only one port is active int lPreviousPort = ports.tcp +ports.udp +ports.tls; // assume only one port is active
if (lPreviousPort>0xFFFF) {
Log.e("Bad port number ["+lPreviousPort+"] using random instead");
lPreviousPort=(0xDFFF & (int)Math.random())+1024;
}
if (!getPrefBoolean(R.string.pref_transport_tcp_key, false)) { if (!getPrefBoolean(R.string.pref_transport_tcp_key, false)) {
ports.tcp = 0; ports.tcp = 0;
} else if (useStandardPort) { } else if (useStandardPort) {

4
submodules/externals/build/exosip/Android.mk vendored
View file

@ -51,14 +51,14 @@ LOCAL_SRC_FILES += \
src/eXrefer_api.c \ src/eXrefer_api.c \
src/jpublish.c \ src/jpublish.c \
src/sdp_offans.c src/sdp_offans.c
#SOCKET_PROGRESS_TIMEOUT=1000 to take care of edge network
LOCAL_CFLAGS += \ LOCAL_CFLAGS += \
-UHAVE_CONFIG_H \ -UHAVE_CONFIG_H \
-include $(LOCAL_PATH)/../build/exosip/libeXosip2_AndroidConfig.h \ -include $(LOCAL_PATH)/../build/exosip/libeXosip2_AndroidConfig.h \
-DOSIP_MT \ -DOSIP_MT \
-DENABLE_TRACE \ -DENABLE_TRACE \
-DSOCKET_TIMEOUT=50 \ -DSOCKET_TIMEOUT=50 \
-DSOCKET_PROGRESS_TIMEOUT=300 \ -DSOCKET_PROGRESS_TIMEOUT=1000 \
-include $(LOCAL_PATH)/include/eXosip2/eXosip_transport_hook.h -include $(LOCAL_PATH)/include/eXosip2/eXosip_transport_hook.h

2
submodules/externals/exosip vendored

@ -1 +1 @@
Subproject commit 8c42924ae9009f6003e98d29638e078ca1bd7c71 Subproject commit 05978321cfc73a91a12c2a818a45a308f3f55a47