From 60807065ca08d66762d1e223fec827e34daa818f Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 16 Sep 2015 21:14:40 +0200 Subject: [PATCH] fix compilation issue --- tester/complex_sip_call.c | 13 +++++++++---- tester/flexisip/flexisip.conf | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tester/complex_sip_call.c b/tester/complex_sip_call.c index 1a1ea750b..40bfe7999 100644 --- a/tester/complex_sip_call.c +++ b/tester/complex_sip_call.c @@ -53,6 +53,8 @@ static void sip_update_within_icoming_reinvite_with_no_sdp(void) { int err; int port = linphone_address_get_port(dest);*/ char *identity_char; + char *scen; + FILE * sipp_out; /*currently we use direct connection because sipp do not properly set ACK request uri*/ mgr= linphone_core_manager_new2( "empty_rc", FALSE); @@ -77,17 +79,20 @@ static void sip_update_within_icoming_reinvite_with_no_sdp(void) { if (port > 0) linphone_address_set_port(dest, port); */ - char* scen = bc_tester_res("sipp/sip_update_within_icoming_reinvite_with_no_sdp.xml"); + scen = bc_tester_res("sipp/sip_update_within_icoming_reinvite_with_no_sdp.xml"); - FILE * sipp_out = sip_start(scen + sipp_out = sip_start(scen , linphone_address_get_username(mgr->identity) , mgr->identity); if (sipp_out) { - BC_ASSERT_TRUE(wait_for_until(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallIncomingReceived, 1,100000)); + BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallIncomingReceived, 1)); linphone_core_accept_call(mgr->lc, linphone_core_get_current_call(mgr->lc)); - BC_ASSERT_TRUE(wait_for_until(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallStreamsRunning, 2,100000)); + BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallStreamsRunning, 2)); + BC_ASSERT_TRUE(wait_for(mgr->lc, mgr->lc, &mgr->stat.number_of_LinphoneCallEnd, 1)); + pclose(sipp_out); } + linphone_core_manager_destroy(mgr); } diff --git a/tester/flexisip/flexisip.conf b/tester/flexisip/flexisip.conf index 7fe250368..f1cce0bef 100644 --- a/tester/flexisip/flexisip.conf +++ b/tester/flexisip/flexisip.conf @@ -40,7 +40,7 @@ aliases=localhost sip2.linphone.org sipopen.example.org sip.example.org auth.exa #note: the ip addresses are explicitely specified here because the machine has several interfaces. In a simple case, using '*' instead of the explicit ip address is sufficient, #and there is no need to specify the ipv6 transport addresses. -transports=sip:94.23.19.176:5060 sips:94.23.19.176:5061;tls-certificates-dir=/etc/flexisip/tls/certificates/cn sips:94.23.19.176:5062;tls-certificates-dir=/etc/flexisip/tls/certificates/altname sips:94.23.19.176:5063;require-peer-certificate=1 sip:94.23.19.176:5064 sip:[2001:41d0:2:14b0::1]:5060 sips:[2001:41d0:2:14b0::1]:5061;tls-certificates-dir=/etc/flexisip/tls/certificates/cn sips:[2001:41d0:2:14b0::1]:5062;tls-certificates-dir=/etc/flexisip/tls/certificates/altname sips:[2001:41d0:2:14b0::1]:5063;require-peer-certificate=1 sip:[2001:41d0:2:14b0::1]:5064 +transports=sip:MacBook-Pro-de-jehan.local:5060 sips:MacBook-Pro-de-jehan.local:5061;tls-certificates-dir=/etc/flexisip/tls/certificates/cn sips:MacBook-Pro-de-jehan.local:5062;tls-certificates-dir=/etc/flexisip/tls/certificates/altname sips:MacBook-Pro-de-jehan.local:5063;require-peer-certificate=1 sip:MacBook-Pro-de-jehan.local:5064 sip:[2001:41d0:2:14b0::1]:5060 sips:[2001:41d0:2:14b0::1]:5061;tls-certificates-dir=/etc/flexisip/tls/certificates/cn sips:[2001:41d0:2:14b0::1]:5062;tls-certificates-dir=/etc/flexisip/tls/certificates/altname sips:[2001:41d0:2:14b0::1]:5063;require-peer-certificate=1 sip:[2001:41d0:2:14b0::1]:5064 # An absolute path of a directory where TLS server certificate and