From 3fdf79fdc5df584a4efe7d2ff35ee904691b1b4d Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 11 Sep 2013 14:21:46 +0200 Subject: [PATCH] make sure random port is used if sip_random_port=1 and no transport selected --- coreapi/linphonecore.c | 8 +++++--- mediastreamer2 | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 4c501c6fa..ac9f22355 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -1890,15 +1890,17 @@ int linphone_core_set_sip_transports(LinphoneCore *lc, const LCSipTransports * t if (lp_config_get_int(lc->config,"sip","sip_random_port",0)==1) { /*legacy random mode*/ - if (tr.udp_port>0 && random_port){ + 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 && random_port){ + }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 && random_port){ + }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; } } if (tr.udp_port == LC_SIP_TRANSPORT_RANDOM) { diff --git a/mediastreamer2 b/mediastreamer2 index a1a296d10..ec2d04150 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit a1a296d106633ff6f250db46e991f53acf4f7991 +Subproject commit ec2d04150521197905bf5812991b54bab97fbdf8