diff options
author | Corey Farrell <git@cfware.com> | 2015-05-22 22:50:43 -0400 |
---|---|---|
committer | Corey Farrell <git@cfware.com> | 2015-05-22 22:58:32 -0400 |
commit | 0d266cbe025e30ce18121f43dbb6b11620b4d5e1 (patch) | |
tree | 3f215665d20602915427b42768fbcbdc1af47e67 /main/stasis.c | |
parent | eaabc4d04c9c4ebca1a4d04b5e9e6a36cc0b764b (diff) |
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
Diffstat (limited to 'main/stasis.c')
-rw-r--r-- | main/stasis.c | 4 |
1 files changed, 4 insertions, 0 deletions
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, |