Skip to content

GitLab

Commit 173ac0e6 authored by Sylvain Berfini's avatar Sylvain Berfini 🐮
Browse files

Updated some tests in Register suite to use new LinphoneTransports object +... 

Updated some tests in Register suite to use new LinphoneTransports object + Fixed wrapper generation for linphone_range_set/get_user_data methods
parent 21a04409
Hide whitespace changes
Inline Side-by-side
include/linphone/misc.h
View file @ 173ac0e6
......@@ -185,6 +185,7 @@ LINPHONE_PUBLIC void linphone_range_unref(LinphoneRange *range);
* Gets the user data in the LinphoneRange object
* @param[in] range the LinphoneRange
* @return the user data
* @ingroup misc
*/
LINPHONE_PUBLIC void *linphone_range_get_user_data(const LinphoneRange *range);
......@@ -192,6 +193,7 @@ LINPHONE_PUBLIC void *linphone_range_get_user_data(const LinphoneRange *range);
* Sets the user data in the LinphoneRange object
* @param[in] range the LinphoneRange object
* @param[in] data the user data
* @ingroup misc
*/
LINPHONE_PUBLIC void linphone_range_set_user_data(LinphoneRange *range, void *data);
......
tester/register_tester.c
View file @ 173ac0e6
......@@ -69,7 +69,7 @@ static void register_with_refresh_base_3(LinphoneCore* lc
,const char* domain
,const char* route
,bool_t late_auth_info
,LCSipTransports transport
,LinphoneTransports *transport
,LinphoneRegistrationState expected_final_state) {
int retry=0;
char* addr;
......@@ -84,7 +84,7 @@ static void register_with_refresh_base_3(LinphoneCore* lc
counters = get_stats(lc);
reset_counters(counters);
linphone_core_set_sip_transports(lc,&transport);
linphone_core_set_transports(lc, transport);
proxy_cfg = linphone_proxy_config_new();
......@@ -141,12 +141,17 @@ static void register_with_refresh_base_2(LinphoneCore* lc
,const char* domain
,const char* route
,bool_t late_auth_info
,LCSipTransports transport) {
,LinphoneTransports *transport) {
register_with_refresh_base_3(lc, refresh, domain, route, late_auth_info, transport,LinphoneRegistrationOk );
}
static void register_with_refresh_base(LinphoneCore* lc, bool_t refresh,const char* domain,const char* route) {
LCSipTransports transport = {5070,5070,0,5071};
LinphoneTransports *transport = linphone_transports_new(lc);
linphone_transports_set_udp_port(transport, 5070);
linphone_transports_set_tcp_port(transport, 5070);
linphone_transports_set_tls_port(transport, 5071);
linphone_transports_set_dtls_port(transport, 0);
register_with_refresh_base_2(lc,refresh,domain,route,FALSE,transport);
linphone_transports_unref(transport);
}
static void register_with_refresh(LinphoneCoreManager* lcm, bool_t refresh,const char* domain,const char* route) {
......@@ -281,10 +286,13 @@ static void simple_tcp_register(void){
static void simple_tcp_register_compatibility_mode(void){
char route[256];
LinphoneCoreManager* lcm;
LCSipTransports transport = {0,5070,0,0};
LinphoneTransports *transport = NULL;
sprintf(route,"sip:%s",test_route);
lcm = create_lcm();
transport = linphone_transports_new(lcm->lc);
linphone_transports_set_tcp_port(transport, 5070);
register_with_refresh_base_2(lcm->lc,FALSE,test_domain,route,FALSE,transport);
linphone_transports_unref(transport);
linphone_core_manager_destroy(lcm);
}
......@@ -356,14 +364,19 @@ static void authenticated_register_with_late_credentials(void){
LinphoneCoreManager *lcm;
stats* counters;
char route[256];
LCSipTransports transport = {5070,5070,0,5071};
LinphoneTransports *transport = NULL;
sprintf(route,"sip:%s",test_route);
lcm = linphone_core_manager_new(NULL);
transport = linphone_transports_new(lcm->lc);
linphone_transports_set_udp_port(transport, 5070);
linphone_transports_set_tcp_port(transport, 5070);
linphone_transports_set_dtls_port(transport, 5071);
counters = get_stats(lcm->lc);
register_with_refresh_base_2(lcm->lc,FALSE,auth_domain,route,TRUE,transport);
linphone_transports_unref(transport);
BC_ASSERT_EQUAL(counters->number_of_auth_info_requested,1, int, "%d");
linphone_core_manager_destroy(lcm);
}
......@@ -412,7 +425,7 @@ static void authenticated_register_with_provided_credentials(void){
static void authenticated_register_with_wrong_late_credentials(void){
LinphoneCoreManager *lcm;
stats* counters;
LCSipTransports transport = {5070,5070,0,5071};
LinphoneTransports *transport = NULL;
char route[256];
const char* saved_test_passwd=test_password;
char* wrong_passwd="mot de pass tout pourri";
......@@ -422,9 +435,15 @@ static void authenticated_register_with_wrong_late_credentials(void){
sprintf(route,"sip:%s",test_route);
lcm = linphone_core_manager_new(NULL);
transport = linphone_transports_new(lcm->lc);
linphone_transports_set_udp_port(transport, 5070);
linphone_transports_set_tcp_port(transport, 5070);
linphone_transports_set_tls_port(transport, 5071);
linphone_transports_set_dtls_port(transport, 0);
counters = get_stats(lcm->lc);
register_with_refresh_base_3(lcm->lc,FALSE,auth_domain,route,TRUE,transport,LinphoneRegistrationFailed);
linphone_transports_unref(transport);
BC_ASSERT_EQUAL(counters->number_of_auth_info_requested,2, int, "%d");
BC_ASSERT_EQUAL(counters->number_of_LinphoneRegistrationFailed,2, int, "%d");
BC_ASSERT_EQUAL(counters->number_of_LinphoneRegistrationProgress,2, int, "%d");
......@@ -435,11 +454,16 @@ static void authenticated_register_with_wrong_late_credentials(void){
static void authenticated_register_with_wrong_credentials_with_params_base(const char* user_agent,LinphoneCoreManager *lcm) {
stats* counters;
LCSipTransports transport = {5070,5070,0,5071};
LinphoneTransports *transport = linphone_transports_new(lcm->lc);
LinphoneAuthInfo *info=linphone_auth_info_new(test_username,NULL,"wrong passwd",NULL,auth_domain,NULL); /*create authentication structure from identity*/
char route[256];
sprintf(route,"sip:%s",test_route);
transport = linphone_transports_new(lcm->lc);
linphone_transports_set_udp_port(transport, 5070);
linphone_transports_set_tcp_port(transport, 5070);
linphone_transports_set_tls_port(transport, 5071);
linphone_transports_set_dtls_port(transport, 0);
sal_set_refresher_retry_after(lcm->lc->sal,500);
if (user_agent) {
......@@ -449,6 +473,7 @@ static void authenticated_register_with_wrong_credentials_with_params_base(const
linphone_auth_info_unref(info);
counters = get_stats(lcm->lc);
register_with_refresh_base_3(lcm->lc,TRUE,auth_domain,route,FALSE,transport,LinphoneRegistrationFailed);
linphone_transports_unref(transport);
//BC_ASSERT_EQUAL(counters->number_of_auth_info_requested,3, int, "%d"); register_with_refresh_base_3 does not alow to precisely check number of number_of_auth_info_requested
/*wait for retry*/
BC_ASSERT_TRUE(wait_for(lcm->lc,lcm->lc,&counters->number_of_auth_info_requested,4));
......@@ -666,12 +691,17 @@ static void proxy_transport_change_with_wrong_port(void) {
LinphoneProxyConfig* proxy_config;
LinphoneAuthInfo *info=linphone_auth_info_new(test_username,NULL,test_password,NULL,auth_domain,NULL); /*create authentication structure from identity*/
char route[256];
LCSipTransports transport= {LC_SIP_TRANSPORT_RANDOM,LC_SIP_TRANSPORT_RANDOM,LC_SIP_TRANSPORT_RANDOM,LC_SIP_TRANSPORT_RANDOM};
LinphoneTransports *transport= linphone_transports_new(lcm->lc);
sprintf(route,"sip:%s",test_route);
linphone_transports_set_udp_port(transport, LC_SIP_TRANSPORT_RANDOM);
linphone_transports_set_tcp_port(transport, LC_SIP_TRANSPORT_RANDOM);
linphone_transports_set_tls_port(transport, LC_SIP_TRANSPORT_RANDOM);
linphone_transports_set_dtls_port(transport, LC_SIP_TRANSPORT_RANDOM);
linphone_core_add_auth_info(lcm->lc,info); /*add authentication info to LinphoneCore*/
linphone_auth_info_unref(info);
register_with_refresh_base_3(lcm->lc, FALSE, auth_domain, "sip2.linphone.org:5987", 0,transport,LinphoneRegistrationProgress);
linphone_transports_unref(transport);
proxy_config = linphone_core_get_default_proxy_config(lcm->lc);
linphone_proxy_config_edit(proxy_config);
......@@ -697,12 +727,17 @@ static void proxy_transport_change_with_wrong_port_givin_up(void) {
LinphoneProxyConfig* proxy_config;
LinphoneAuthInfo *info=linphone_auth_info_new(test_username,NULL,test_password,NULL,auth_domain,NULL); /*create authentication structure from identity*/
char route[256];
LCSipTransports transport= {LC_SIP_TRANSPORT_RANDOM,LC_SIP_TRANSPORT_RANDOM,LC_SIP_TRANSPORT_RANDOM,LC_SIP_TRANSPORT_RANDOM};
LinphoneTransports *transport = linphone_transports_new(lcm->lc);
sprintf(route,"sip:%s",test_route);
linphone_transports_set_udp_port(transport, LC_SIP_TRANSPORT_RANDOM);
linphone_transports_set_tcp_port(transport, LC_SIP_TRANSPORT_RANDOM);
linphone_transports_set_tls_port(transport, LC_SIP_TRANSPORT_RANDOM);
linphone_transports_set_dtls_port(transport, LC_SIP_TRANSPORT_RANDOM);
linphone_core_add_auth_info(lcm->lc,info); /*add authentication info to LinphoneCore*/
linphone_auth_info_unref(info);
register_with_refresh_base_3(lcm->lc, FALSE, auth_domain, "sip2.linphone.org:5987", 0,transport,LinphoneRegistrationProgress);
linphone_transports_unref(transport);
proxy_config = linphone_core_get_default_proxy_config(lcm->lc);
linphone_proxy_config_edit(proxy_config);
......@@ -980,12 +1015,15 @@ static void tls_wildcard_register(void){
static void redirect(void){
char route[256];
LinphoneCoreManager* lcm;
LCSipTransports transport = {-1,0,0,0};
LinphoneTransports *transport = NULL;
sprintf(route,"sip:%s:5064",test_route);
lcm = create_lcm();
if (lcm) {
transport = linphone_transports_new(lcm->lc);
linphone_transports_set_udp_port(transport, -1);
linphone_core_set_user_agent(lcm->lc,"redirect",NULL);
register_with_refresh_base_2(lcm->lc,FALSE,test_domain,route,FALSE,transport);
linphone_transports_unref(transport);
linphone_core_manager_destroy(lcm);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment