diff --git a/coreapi/private.h b/coreapi/private.h index ae1e109bd..08db6a40d 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -434,7 +434,6 @@ struct _LinphoneProxyConfig /*use to check if server config has changed between edit() and done()*/ LinphoneAddress *saved_proxy; LinphoneAddress *saved_identity; - LinphoneAddress *saved_route; /*---*/ }; diff --git a/coreapi/proxy.c b/coreapi/proxy.c index a71ea868a..d7b99aeb2 100644 --- a/coreapi/proxy.c +++ b/coreapi/proxy.c @@ -39,12 +39,6 @@ static void linphone_proxy_config_store_server_config(LinphoneProxyConfig* obj) obj->saved_proxy = linphone_address_new(obj->reg_proxy); else obj->saved_proxy = NULL; - - if (obj->saved_route) linphone_address_destroy(obj->saved_route); - if (obj->reg_route) - obj->saved_route = linphone_address_new(obj->reg_route); - else - obj->saved_route = NULL; } bool_t linphone_proxy_config_address_equal(const LinphoneAddress *a, const LinphoneAddress *b) { @@ -67,7 +61,6 @@ bool_t linphone_proxy_config_address_equal(const LinphoneAddress *a, const Linph bool_t linphone_proxy_config_is_server_config_changed(const LinphoneProxyConfig* obj) { LinphoneAddress *current_identity=obj->reg_identity?linphone_address_new(obj->reg_identity):NULL; LinphoneAddress *current_proxy=obj->reg_proxy?linphone_address_new(obj->reg_proxy):NULL; - LinphoneAddress *current_route=obj->reg_route?linphone_address_new(obj->reg_route):NULL; if (!linphone_proxy_config_address_equal(obj->saved_identity,current_identity)) return TRUE; @@ -75,9 +68,6 @@ bool_t linphone_proxy_config_is_server_config_changed(const LinphoneProxyConfig* if (!linphone_proxy_config_address_equal(obj->saved_proxy,current_proxy)) return TRUE; - if (!linphone_proxy_config_address_equal(obj->saved_route,current_route)) - return TRUE; - return FALSE; } @@ -162,7 +152,6 @@ void linphone_proxy_config_destroy(LinphoneProxyConfig *obj){ if (obj->contact_uri_params) ms_free(obj->contact_uri_params); if (obj->saved_proxy!=NULL) linphone_address_destroy(obj->saved_proxy); if (obj->saved_identity!=NULL) ms_free(obj->saved_identity); - if (obj->saved_route!=NULL) ms_free(obj->saved_route); ms_free(obj); } diff --git a/tester/setup_tester.c b/tester/setup_tester.c index 2ef643b86..760cdf6bd 100644 --- a/tester/setup_tester.c +++ b/tester/setup_tester.c @@ -137,19 +137,19 @@ void linphone_proxy_config_is_server_config_changed_test() { linphone_proxy_config_set_server_addr(proxy_config,"sip:toto.com"); CU_ASSERT_TRUE(linphone_proxy_config_is_server_config_changed(proxy_config)); - linphone_proxy_config_set_route(proxy_config,"sip:sip.linphone.org"); + linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org"); linphone_proxy_config_edit(proxy_config); - linphone_proxy_config_set_route(proxy_config,"sip:sip.linphone.org:4444"); + linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org:4444"); CU_ASSERT_TRUE(linphone_proxy_config_is_server_config_changed(proxy_config)); - linphone_proxy_config_set_route(proxy_config,"sip:sip.linphone.org"); + linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org"); linphone_proxy_config_edit(proxy_config); - linphone_proxy_config_set_route(proxy_config,"sip:sip.linphone.org;transport=tcp"); + linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org;transport=tcp"); CU_ASSERT_TRUE(linphone_proxy_config_is_server_config_changed(proxy_config)); - linphone_proxy_config_set_route(proxy_config,"sip:sip.linphone.org"); + linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org"); linphone_proxy_config_edit(proxy_config); - linphone_proxy_config_set_route(proxy_config,"sip:sip.linphone.org;param=blue"); + linphone_proxy_config_set_server_addr(proxy_config,"sip:sip.linphone.org;param=blue"); CU_ASSERT_FALSE(linphone_proxy_config_is_server_config_changed(proxy_config));