From 0d266cbe025e30ce18121f43dbb6b11620b4d5e1 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Fri, 22 May 2015 22:50:43 -0400 Subject: Stasis: Fix unsafe use of stasis_unsubscribe in modules. Many uses of stasis_unsubscribe in modules can be reached through unload. These have been switched to stasis_unsubscribe_and_join. Some subscription callbacks do nothing, for these I've created a noop callback function in stasis.c. This is used by some modules that monitor MWI topics in order to enable cache, since the callback does not become invalid after dlclose it is safe to use stasis_unsubscribe on these, even during module unload. ASTERISK-25121 #close Change-Id: Ifc2549fbd8eef7d703c222978e8f452e2972189c --- main/stasis.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'main/stasis.c') diff --git a/main/stasis.c b/main/stasis.c index c2d552e4b..6adbfc3b6 100644 --- a/main/stasis.c +++ b/main/stasis.c @@ -444,6 +444,10 @@ static void subscription_invoke(struct stasis_subscription *sub, static void send_subscription_subscribe(struct stasis_topic *topic, struct stasis_subscription *sub); static void send_subscription_unsubscribe(struct stasis_topic *topic, struct stasis_subscription *sub); +void stasis_subscription_cb_noop(void *data, struct stasis_subscription *sub, struct stasis_message *message) +{ +} + struct stasis_subscription *internal_stasis_subscribe( struct stasis_topic *topic, stasis_subscription_cb callback, -- cgit v1.2.3