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

Merge "res_stasis_device_state: Unsubscribe should remove old subscriptions"

Browse Source
This commit is contained in:
Joshua Colp
2017-07-26 08:27:31 -05:00
committed by Gerrit Code Review
parent 3dff2711a3 4f4936fd72
commit 7ea6c66968
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_stasis_device_state.c
View File

@@ -106,7 +106,6 @@ static int device_state_subscriptions_cmp(void *obj, void *arg, int flags)
static void device_state_subscription_destroy(void *obj)
{
struct device_state_subscription *sub = obj;
sub->sub = stasis_unsubscribe_and_join(sub->sub);
ast_string_field_free_memory(sub);
}
@@ -152,6 +151,9 @@ static struct device_state_subscription *find_device_state_subscription(
static void remove_device_state_subscription(
struct device_state_subscription *sub)
{
if (sub->sub) {
sub->sub = stasis_unsubscribe_and_join(sub->sub);
}
ao2_unlink_flags(device_state_subscriptions, sub, OBJ_NOLOCK);
}