diff --git a/tester/flexisip/flexisip.conf b/tester/flexisip/flexisip.conf index f1cce0bef..5943e57a3 100644 --- a/tester/flexisip/flexisip.conf +++ b/tester/flexisip/flexisip.conf @@ -38,9 +38,9 @@ aliases=localhost sip2.linphone.org sipopen.example.org sip.example.org auth.exa # Default value: sip:* #transports=sip:192.168.56.101:5060 sips:192.168.56.101:5061 -#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, +#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: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 +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 # An absolute path of a directory where TLS server certificate and @@ -107,20 +107,19 @@ no-403=user-agent contains 'tester-no-403' # to true. Ex: from.uri.domain contains 'sip.linphone.org', from.uri.domain # in 'a.org b.org c.org', (to.uri.domain in 'a.org b.org c.org') # && (user-agent == 'Linphone v2') -# Default value: -filter= from.uri.domain contains 'sip.example.org' || from.uri.domain contains 'auth.example.org' || from.uri.domain contains 'auth1.example.org' || from.uri.domain contains 'auth2.example.org' || from.uri.domain contains 'anonymous.invalid' +# Default value: +filter= from.uri.domain contains 'sip.example.org' || from.uri.domain contains 'auth.example.org' || from.uri.domain contains 'auth1.example.org' || from.uri.domain contains 'auth2.example.org' || from.uri.domain contains 'anonymous.invalid' # List of whitespace separated domain names to challenge. Others # are denied. -# Default value: +# Default value: auth-domains= sip.example.org auth.example.org auth1.example.org auth2.example.org -client-certificates-domains=client.example.org # List of whitespace separated IP which will not be challenged. -# Default value: -trusted-hosts= +# Default value: +trusted-hosts=127.0.0.1 94.23.19.176 # Database backend implementation [odbc, file]. # Default value: odbc @@ -615,3 +614,11 @@ packet-rate-limit=5 # Default value: 2 ban-time=1 +[module::Presence] +enabled=true +presence-server = + +[presence-server] +expires = 600 +transports = sip:127.0.0.1:5065;transport=tcp + diff --git a/tester/presence_tester.c b/tester/presence_tester.c index 6f29b0915..97c4ac353 100644 --- a/tester/presence_tester.c +++ b/tester/presence_tester.c @@ -391,12 +391,10 @@ static void subscribe_presence_forked(void){ } static void subscribe_presence_expired(void){ - LinphoneCoreManager* marie = presence_linphone_core_manager_new("marie"); - LinphoneCoreManager* pauline1 = presence_linphone_core_manager_new("pauline"); - LinphoneAddress *marie_addr = linphone_address_clone(marie->identity); + LinphoneCoreManager* marie = linphone_core_manager_new("marie_rc"); + LinphoneCoreManager* pauline1 = linphone_core_manager_new(transport_supported(LinphoneTransportTls) ? "pauline_rc" : "pauline_tcp_rc"); LinphoneFriend *lf; MSList *lcs = NULL; - linphone_address_set_port(marie_addr,0); /*remove port */ lcs = ms_list_append(lcs, marie->lc); lcs = ms_list_append(lcs, pauline1->lc); @@ -413,7 +411,7 @@ static void subscribe_presence_expired(void){ BC_ASSERT_TRUE(wait_for_list(lcs,&pauline1->stat.number_of_NewSubscriptionRequest,1, 5000)); BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphonePresenceActivityOnline,1, 2000)); - lf = linphone_core_find_friend(pauline1->lc, marie_addr); + lf = linphone_core_find_friend(pauline1->lc, marie->identity); BC_ASSERT_PTR_NOT_NULL(lf->insubs); /*marie comes offline suddenly*/ linphone_core_set_network_reachable(marie->lc, FALSE); @@ -423,7 +421,7 @@ static void subscribe_presence_expired(void){ BC_ASSERT_PTR_NULL(lf->insubs); /*just make network reachable so that marie can unregister properly*/ linphone_core_set_network_reachable(marie->lc, TRUE); - //BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneRegistrationOk,2, 10000)); + BC_ASSERT_TRUE(wait_for_list(lcs,&marie->stat.number_of_LinphoneRegistrationOk,2, 10000)); linphone_core_manager_destroy(marie); linphone_core_manager_destroy(pauline1);