kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

pjsip: Update ACLs on named ACL changes.

Browse Source 
This change extends the Sorcery API to allow a wizard to be
told to explicitly reload objects or a specific object type
even if the wizard believes that nothing has changed.

This has been leveraged by res_pjsip and res_pjsip_acl to
reload endpoints and PJSIP ACLs when a named ACL changes.

ASTERISK-28697

Change-Id: Ib8fee9bd9dd490db635132c479127a4114c1ca0b
This commit is contained in:
Joshua C. Colp
2020-02-18 13:10:16 +00:00
parent e213bc530f
commit b20a215ea7
5 changed files with 112 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
main/sorcery.c
View File

@@ -245,6 +245,9 @@ struct sorcery_load_details {
/*! \brief Whether this is a reload or not */
unsigned int reload:1;
/*! \brief Whether this is forced or not */
unsigned int force:1;
};
/*! \brief Registered sorcery wizards */
@@ -1250,7 +1253,15 @@ static int sorcery_wizard_load(void *obj, void *arg, int flags)
struct sorcery_load_details *details = arg;
void (*load)(void *data, const struct ast_sorcery *sorcery, const char *type);
load = !details->reload ? wizard->wizard->callbacks.load : wizard->wizard->callbacks.reload;
if (details->reload) {
if (details->force && wizard->wizard->callbacks.force_reload) {
load = wizard->wizard->callbacks.force_reload;
} else {
load = wizard->wizard->callbacks.reload;
}
} else {
load = wizard->wizard->callbacks.load;
}
if (load) {
NOTIFY_WIZARD_OBSERVERS(wizard->wizard->observers, wizard_loading,
@@ -1408,6 +1419,23 @@ void ast_sorcery_reload(const struct ast_sorcery *sorcery)
}
void ast_sorcery_force_reload(const struct ast_sorcery *sorcery)
{
struct sorcery_load_details details = {
.sorcery = sorcery,
.reload = 1,
.force = 1,
};
NOTIFY_INSTANCE_OBSERVERS(sorcery->observers, instance_loading,
sorcery->module_name, sorcery, 1);
ao2_callback(sorcery->types, OBJ_NODATA, sorcery_object_load, &details);
NOTIFY_INSTANCE_OBSERVERS(sorcery->observers, instance_loaded,
sorcery->module_name, sorcery, 1);
}
void ast_sorcery_reload_object(const struct ast_sorcery *sorcery, const char *type)
{
RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, type, OBJ_KEY), ao2_cleanup);
@@ -1423,6 +1451,22 @@ void ast_sorcery_reload_object(const struct ast_sorcery *sorcery, const char *ty
sorcery_object_load(object_type, &details, 0);
}
void ast_sorcery_force_reload_object(const struct ast_sorcery *sorcery, const char *type)
{
RAII_VAR(struct ast_sorcery_object_type *, object_type, ao2_find(sorcery->types, type, OBJ_KEY), ao2_cleanup);
struct sorcery_load_details details = {
.sorcery = sorcery,
.reload = 1,
.force = 1,
};
if (!object_type) {
return;
}
sorcery_object_load(object_type, &details, 0);
}
void ast_sorcery_ref(struct ast_sorcery *sorcery)
{
ao2_ref(sorcery, +1);