diff options
Diffstat (limited to 'main/manager_bridges.c')
| -rw-r--r-- | main/manager_bridges.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/main/manager_bridges.c b/main/manager_bridges.c index 77d9ff05e..fad676b56 100644 --- a/main/manager_bridges.c +++ b/main/manager_bridges.c @@ -106,7 +106,7 @@ static struct stasis_message_router *bridge_state_router; /*! \brief The \ref stasis subscription returned by the forwarding of the channel topic * to the manager topic */ -static struct stasis_subscription *topic_forwarder; +static struct stasis_forward *topic_forwarder; struct ast_str *ast_manager_build_bridge_state_string_prefix( const struct ast_bridge_snapshot *snapshot, @@ -180,7 +180,6 @@ bridge_snapshot_monitor bridge_monitors[] = { }; static void bridge_snapshot_update(void *data, struct stasis_subscription *sub, - struct stasis_topic *topic, struct stasis_message *message) { RAII_VAR(struct ast_str *, bridge_event_string, NULL, ast_free); @@ -221,7 +220,6 @@ static void bridge_snapshot_update(void *data, struct stasis_subscription *sub, } static void bridge_merge_cb(void *data, struct stasis_subscription *sub, - struct stasis_topic *topic, struct stasis_message *message) { struct ast_bridge_merge_message *merge_msg = stasis_message_data(message); @@ -254,7 +252,6 @@ static void bridge_merge_cb(void *data, struct stasis_subscription *sub, } static void channel_enter_cb(void *data, struct stasis_subscription *sub, - struct stasis_topic *topic, struct stasis_message *message) { static const char *swap_name = "SwapUniqueid: "; @@ -283,7 +280,6 @@ static void channel_enter_cb(void *data, struct stasis_subscription *sub, } static void channel_leave_cb(void *data, struct stasis_subscription *sub, - struct stasis_topic *topic, struct stasis_message *message) { struct ast_bridge_blob *blob = stasis_message_data(message); @@ -456,7 +452,7 @@ static int manager_bridge_info(struct mansession *s, const struct message *m) static void manager_bridging_cleanup(void) { - stasis_unsubscribe(topic_forwarder); + stasis_forward_cancel(topic_forwarder); topic_forwarder = NULL; } |