From 3e5672d843de69761e151238111a9a49e0064b4b Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Wed, 6 Apr 2016 18:28:49 -0300
Subject: [PATCH] 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
---
res/res_pjsip/config_global.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/res/res_pjsip/config_global.c b/res/res_pjsip/config_global.c
index ad03379fdb..8348a1eb5b 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;
--
GitLab