mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-17 10:11:53 +00:00
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
This commit is contained in:
@@ -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, OPT_STRINGFIELD_T, 0, STRFLDSET(struct global_config,
|
||||||
default_voicemail_extension));
|
default_voicemail_extension));
|
||||||
ast_sorcery_object_field_register(sorcery, "global", "regcontext", DEFAULT_REGCONTEXT,
|
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",
|
ast_sorcery_object_field_register(sorcery, "global", "contact_expiration_check_interval",
|
||||||
__stringify(DEFAULT_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)) {
|
if (ast_sorcery_instance_observer_add(sorcery, &observer_callbacks_global)) {
|
||||||
return -1;
|
return -1;
|
||||||
|
Reference in New Issue
Block a user