From 250495034edf5837cb0a652fd6dfd1232f060918 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Tue, 25 Mar 2014 22:47:35 +0100
Subject: [PATCH] rely on belle-sip ability to choose SIP transport random port
 using bind().

---
 coreapi/bellesip_sal/sal_impl.c | 16 ++++++++++----
 coreapi/linphonecore.c          | 37 +++++++++++----------------------
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c
index be3c9ba17..ff6c0c17a 100644
--- a/coreapi/bellesip_sal/sal_impl.c
+++ b/coreapi/bellesip_sal/sal_impl.c
@@ -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);
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 9cd36d0fd..b5cda087b 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -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){