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

Merge "pjsip_configuration: On delete, remove the persistent version of an endpoint" into 13

Browse Source
This commit is contained in:
Matt Jordan
2015-11-04 07:44:12 -06:00
committed by Gerrit Code Review
parent 562556c79f 715f770c9f
commit 1cf699c848
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_pjsip/pjsip_configuration.c
View File

@@ -253,6 +253,17 @@ static const struct ast_sorcery_observer state_contact_status_observer = {
.updated = persistent_endpoint_contact_status_observer, .updated = persistent_endpoint_contact_status_observer,
}; };
static void endpoint_deleted_observer(const void *object)
{
const struct ast_sip_endpoint *endpoint = object;
ao2_find(persistent_endpoints, ast_endpoint_get_resource(endpoint->persistent), OBJ_SEARCH_KEY | OBJ_UNLINK | OBJ_NODATA);
}
static const struct ast_sorcery_observer endpoint_observers = {
.deleted = endpoint_deleted_observer,
};
static int dtmf_handler(const struct aco_option *opt, struct ast_variable *var, void *obj) static int dtmf_handler(const struct aco_option *opt, struct ast_variable *var, void *obj)
{ {
struct ast_sip_endpoint *endpoint = obj; struct ast_sip_endpoint *endpoint = obj;
@@ -1954,6 +1965,7 @@ int ast_res_pjsip_initialize_configuration(const struct ast_module_info *ast_mod
return -1; return -1;
} }
ast_sorcery_observer_add(sip_sorcery, "endpoint", &endpoint_observers);
ast_sorcery_observer_add(sip_sorcery, "contact", &state_contact_observer); ast_sorcery_observer_add(sip_sorcery, "contact", &state_contact_observer);
ast_sorcery_observer_add(sip_sorcery, CONTACT_STATUS, &state_contact_status_observer); ast_sorcery_observer_add(sip_sorcery, CONTACT_STATUS, &state_contact_status_observer);