]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
res_pjsip: Fix configuration setting of "regcontext". 41/2541/1
authorJoshua Colp <jcolp@digium.com>
Wed, 6 Apr 2016 21:28:49 +0000 (18:28 -0300)
committerJoshua Colp <jcolp@digium.com>
Wed, 6 Apr 2016 21:28:49 +0000 (18:28 -0300)
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

index ad03379fdb1243eb685afdb6d4d40ae11a6e703e..8348a1eb5bd397c236c1e227b2a3cbf6e23ada89 100644 (file)
@@ -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;