summaryrefslogtreecommitdiff
path: root/res/res_pjsip/config_global.c
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2016-04-06 18:28:49 -0300
committerJoshua Colp <jcolp@digium.com>2016-04-06 16:29:58 -0500
commit3e5672d843de69761e151238111a9a49e0064b4b (patch)
treeff7b9e0a759046e65e33dcf69128fda7f098cb1d /res/res_pjsip/config_global.c
parent8ed5f611523e7f435433fa695fef8334e9101f36 (diff)
res_pjsip: Fix configuration setting of "regcontext".
Due to a merge problem two options were swapped causing the regcontext setting to not get set. Change-Id: Icb33edc668e7357bacbaec2861a6b5ac64edaff1
Diffstat (limited to 'res/res_pjsip/config_global.c')
-rw-r--r--res/res_pjsip/config_global.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_pjsip/config_global.c b/res/res_pjsip/config_global.c
index ad03379fd..8348a1eb5 100644
--- a/res/res_pjsip/config_global.c
+++ b/res/res_pjsip/config_global.c
@@ -369,10 +369,10 @@ int ast_sip_initialize_sorcery_global(void)
DEFAULT_VOICEMAIL_EXTENSION, OPT_STRINGFIELD_T, 0, STRFLDSET(struct global_config,
default_voicemail_extension));
ast_sorcery_object_field_register(sorcery, "global", "regcontext", DEFAULT_REGCONTEXT,
- OPT_UINT_T, 0, FLDSET(struct global_config, contact_expiration_check_interval));
+ OPT_STRINGFIELD_T, 0, STRFLDSET(struct global_config, regcontext));
ast_sorcery_object_field_register(sorcery, "global", "contact_expiration_check_interval",
__stringify(DEFAULT_CONTACT_EXPIRATION_CHECK_INTERVAL),
- OPT_STRINGFIELD_T, 0, STRFLDSET(struct global_config, regcontext));
+ OPT_UINT_T, 0, FLDSET(struct global_config, contact_expiration_check_interval));
if (ast_sorcery_instance_observer_add(sorcery, &observer_callbacks_global)) {
return -1;