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

Merge "res_pjsip_registrar: lock transport monitor when setting 'removing' flag" into 13

Browse Source
This commit is contained in:
Joshua C. Colp
2019-02-08 09:34:35 -06:00
committed by Gerrit Code Review
parent d496bf2099 3974633c00
commit cb45aa1f9d
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
res/res_pjsip_registrar.c
View File

@@ -341,25 +341,15 @@ static int register_contact_transport_remove_cb(void *data)
lock = ast_named_lock_get(AST_NAMED_LOCK_TYPE_MUTEX, "aor", monitor->aor_name); lock = ast_named_lock_get(AST_NAMED_LOCK_TYPE_MUTEX, "aor", monitor->aor_name);
if (!lock) { if (!lock) {
ao2_lock(monitor);
monitor->removing = 0;
ao2_unlock(monitor);
ao2_ref(monitor, -1); ao2_ref(monitor, -1);
return 0; return 0;
} }
ao2_lock(lock); ao2_lock(lock);
/*
* We're now locked so check again to make sure some other thread is not
* currently removing the contact, or already has.
*/
if (monitor->removing) {
ao2_unlock(lock);
ast_named_lock_put(lock);
ao2_ref(monitor, -1);
return 0;
}
monitor->removing = 1;
contact = ast_sip_location_retrieve_contact(monitor->contact_name); contact = ast_sip_location_retrieve_contact(monitor->contact_name);
if (contact) { if (contact) {
ast_sip_location_delete_contact(contact); ast_sip_location_delete_contact(contact);
@@ -401,14 +391,15 @@ static void register_contact_transport_shutdown_cb(void *data)
* same monitor from different threads. Only one of the calls needs to do the * same monitor from different threads. Only one of the calls needs to do the
* actual removing of the contact, so if one is currently removing then any * actual removing of the contact, so if one is currently removing then any
* subsequent calls can skip. * subsequent calls can skip.
*
* We'll call it non locked here, but check again once locked just in case the
* flag was updated (see register_contact_transport_remove_cb).
*/ */
ao2_lock(monitor);
if (monitor->removing) { if (monitor->removing) {
ao2_unlock(monitor);
return; return;
} }
monitor->removing = 1;
/* /*
* Push off to a default serializer. This is in case sorcery * Push off to a default serializer. This is in case sorcery
* does database accesses for contacts. Database accesses may * does database accesses for contacts. Database accesses may
@@ -417,8 +408,11 @@ static void register_contact_transport_shutdown_cb(void *data)
*/ */
ao2_ref(monitor, +1); ao2_ref(monitor, +1);
if (ast_sip_push_task(NULL, register_contact_transport_remove_cb, monitor)) { if (ast_sip_push_task(NULL, register_contact_transport_remove_cb, monitor)) {
monitor->removing = 0;
ao2_ref(monitor, -1); ao2_ref(monitor, -1);
} }
ao2_unlock(monitor);
} }
AST_VECTOR(excess_contact_vector, struct ast_sip_contact *); AST_VECTOR(excess_contact_vector, struct ast_sip_contact *);
@@ -729,8 +723,8 @@ static void register_aor_core(pjsip_rx_data *rdata,
* the contact won't be valid anymore if that happens. * the contact won't be valid anymore if that happens.
*/ */
contact_name = ast_sorcery_object_get_id(contact); contact_name = ast_sorcery_object_get_id(contact);
monitor = ao2_alloc_options(sizeof(*monitor) + 2 + strlen(aor_name) monitor = ao2_alloc(sizeof(*monitor) + 2 + strlen(aor_name)
+ strlen(contact_name), NULL, AO2_ALLOC_OPT_LOCK_NOLOCK); + strlen(contact_name), NULL);
if (monitor) { if (monitor) {
strcpy(monitor->aor_name, aor_name);/* Safe */ strcpy(monitor->aor_name, aor_name);/* Safe */
monitor->contact_name = monitor->aor_name + strlen(aor_name) + 1; monitor->contact_name = monitor->aor_name + strlen(aor_name) + 1;