mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-20 12:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rely on belle-sip ability to choose SIP transport random port using bind().

Browse source
This commit is contained in:
Simon Morlat 2014-03-25 22:47:35 +01:00
parent 838a3c3ed4
commit 250495034e
2 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
coreapi/bellesip_sal/sal_impl.c
View file

@ -537,10 +537,18 @@ int sal_transport_available(Sal *sal, SalTransport t){
int sal_add_listen_port(Sal *ctx, SalAddress* addr){
int result;
belle_sip_listening_point_t* lp = belle_sip_stack_create_listening_point(ctx->stack
,sal_address_get_domain(addr)
,sal_address_get_port(addr)
,sal_transport_to_string(sal_address_get_transport(addr)));
belle_sip_listening_point_t* lp = belle_sip_stack_create_listening_point(ctx->stack,
sal_address_get_domain(addr),
sal_address_get_port(addr),
sal_transport_to_string(sal_address_get_transport(addr)));
if (sal_address_get_port(addr)==-1 && lp==NULL){
int random_port=(0xDFFF&random())+1024;
ms_warning("This version of belle-sip doesn't support random port, choosing one here.");
lp = belle_sip_stack_create_listening_point(ctx->stack,
sal_address_get_domain(addr),
random_port,
sal_transport_to_string(sal_address_get_transport(addr)));
}
if (lp) {
belle_sip_listening_point_set_keep_alive(lp,ctx->keep_alive);
result = belle_sip_provider_add_listening_point(ctx->prov,lp);

37
coreapi/linphonecore.c
View file

@ -1918,25 +1918,23 @@ static int apply_transports(LinphoneCore *lc){
anyaddr="0.0.0.0";
sal_unlisten_ports(sal);
if (tr->udp_port>0){
if (tr->udp_port!=0){
if (sal_listen_port (sal,anyaddr,tr->udp_port,SalTransportUDP,FALSE)!=0){
transport_error(lc,"udp",tr->udp_port);
return -1;
}
}
if (tr->tcp_port>0){
if (tr->tcp_port!=0){
if (sal_listen_port (sal,anyaddr,tr->tcp_port,SalTransportTCP,FALSE)!=0){
transport_error(lc,"tcp",tr->tcp_port);
}
}
if (tr->tls_port>0){
if (tr->tls_port!=0){
if (sal_listen_port (sal,anyaddr,tr->tls_port,SalTransportTLS,TRUE)!=0){
transport_error(lc,"tls",tr->tls_port);
}
}
apply_user_agent(lc);
return 0;
}
@ -1957,31 +1955,20 @@ bool_t linphone_core_sip_transport_supported(const LinphoneCore *lc, LinphoneTra
**/
int linphone_core_set_sip_transports(LinphoneCore *lc, const LCSipTransports * tr_config /*config to be saved*/){
LCSipTransports tr=*tr_config;
int random_port=(0xDFFF&random())+1024;
if (lp_config_get_int(lc->config,"sip","sip_random_port",0)==1) {
/*legacy random mode*/
if (tr.udp_port>0){
tr.udp_port=random_port;
tr.tls_port=tr.tcp_port=0; /*make sure only one transport is active at a time*/
}else if (tr.tcp_port>0){
tr.tcp_port=random_port;
tr.tls_port=tr.udp_port=0; /*make sure only one transport is active at a time*/
}else if (tr.tls_port>0){
tr.tls_port=random_port;
tr.udp_port=tr.tcp_port=0; /*make sure only one transport is active at a time*/
} else {
tr.udp_port=random_port;
tr.udp_port=LC_SIP_TRANSPORT_RANDOM;
}
if (tr.tcp_port>0){
tr.tcp_port=LC_SIP_TRANSPORT_RANDOM;
}
if (tr.tls_port>0){
tr.tls_port=LC_SIP_TRANSPORT_RANDOM;
}else {
tr.udp_port=LC_SIP_TRANSPORT_RANDOM;
}
}
if (tr.udp_port == LC_SIP_TRANSPORT_RANDOM) {
tr.udp_port=random_port;
}
if (tr.tcp_port == LC_SIP_TRANSPORT_RANDOM) {
tr.tcp_port=random_port;
}
if (tr.tls_port == LC_SIP_TRANSPORT_RANDOM) {
tr.tls_port=random_port+1;
}
if (tr.udp_port==0 && tr.tcp_port==0 && tr.tls_port==0){