From 7d64dedf12c4a7795d2ffe204416543025055de2 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Mon, 3 Mar 2014 15:07:11 +0100 Subject: [PATCH] Fixed missing init in proxy config creation + added test for proxy_default_values in lpconfig --- coreapi/proxy.c | 1 + tester/rcfiles/marie_remote_default_values_rc | 2 ++ tester/remote_provisioning_tester.c | 14 +++++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 tester/rcfiles/marie_remote_default_values_rc diff --git a/coreapi/proxy.c b/coreapi/proxy.c index 5633038f4..635d94ec5 100644 --- a/coreapi/proxy.c +++ b/coreapi/proxy.c @@ -52,6 +52,7 @@ static void linphone_proxy_config_init(LinphoneCore* lc, LinphoneProxyConfig *ob memset(obj, 0, sizeof(LinphoneProxyConfig)); obj->magic = linphone_proxy_config_magic; obj->expires = lc ? lp_config_get_default_int(lc->config, "proxy", "reg_expires", 3600) : 3600; + obj->reg_sendregister = lc ? lp_config_get_default_int(lc->config, "proxy", "reg_sendregister", 0) : 0; obj->dial_prefix = dial_prefix ? ms_strdup(dial_prefix) : NULL; obj->dial_escape_plus = lc ? lp_config_get_default_int(lc->config, "proxy", "dial_escape_plus", 0) : 0; obj->privacy = lc ? lp_config_get_default_int(lc->config, "proxy", "privacy", LinphonePrivacyDefault) : LinphonePrivacyDefault; diff --git a/tester/rcfiles/marie_remote_default_values_rc b/tester/rcfiles/marie_remote_default_values_rc new file mode 100644 index 000000000..ec5e4f633 --- /dev/null +++ b/tester/rcfiles/marie_remote_default_values_rc @@ -0,0 +1,2 @@ +[misc] +config-uri=http://smtp.linphone.org/marie_default diff --git a/tester/remote_provisioning_tester.c b/tester/remote_provisioning_tester.c index 15e2ff05e..850542355 100644 --- a/tester/remote_provisioning_tester.c +++ b/tester/remote_provisioning_tester.c @@ -76,13 +76,25 @@ static void remote_provisioning_invalid(void) { linphone_core_manager_destroy(marie); } +static void remote_provisioning_default_values(void) { + LinphoneCoreManager* marie = linphone_core_manager_new2("marie_remote_default_values_rc", FALSE); + CU_ASSERT_TRUE(wait_for(marie->lc,NULL,&marie->stat.number_of_LinphoneConfiguringSuccessful,1)); + LinphoneProxyConfig *lpc = linphone_core_create_proxy_config(marie->lc); + CU_ASSERT_TRUE(lpc->reg_sendregister == 1); + CU_ASSERT_TRUE(lpc->expires == 604800); + CU_ASSERT_TRUE(strcmp(lpc->reg_proxy, "") == 0); + CU_ASSERT_TRUE(strcmp(lpc->reg_identity, "sip:?@sip.linphone.org") == 0); + linphone_core_manager_destroy(marie); +} + test_t remote_provisioning_tests[] = { { "Remote provisioning skipped", remote_provisioning_skipped }, { "Remote provisioning successful behind http", remote_provisioning_http }, { "Remote provisioning successful behind https", remote_provisioning_https }, { "Remote provisioning 404 not found", remote_provisioning_not_found }, { "Remote provisioning invalid", remote_provisioning_invalid }, - { "Remote provisioning transient successful", remote_provisioning_transient } + { "Remote provisioning transient successful", remote_provisioning_transient }, + { "Remote provisioning default values", remote_provisioning_default_values } }; test_suite_t remote_provisioning_test_suite = {