diff options
Diffstat (limited to 'res/stasis/app.c')
| -rw-r--r-- | res/stasis/app.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/res/stasis/app.c b/res/stasis/app.c index ab46be508..bc1268fb7 100644 --- a/res/stasis/app.c +++ b/res/stasis/app.c @@ -58,9 +58,9 @@ struct app_forwards { int interested; /*! Forward for the regular topic */ - struct stasis_subscription *topic_forward; + struct stasis_forward *topic_forward; /*! Forward for the caching topic */ - struct stasis_subscription *topic_cached_forward; + struct stasis_forward *topic_cached_forward; /*! Unique id of the object being forwarded */ char id[]; @@ -78,9 +78,9 @@ static void forwards_dtor(void *obj) static void forwards_unsubscribe(struct app_forwards *forwards) { - stasis_unsubscribe(forwards->topic_forward); + stasis_forward_cancel(forwards->topic_forward); forwards->topic_forward = NULL; - stasis_unsubscribe(forwards->topic_cached_forward); + stasis_forward_cancel(forwards->topic_cached_forward); forwards->topic_cached_forward = NULL; } @@ -129,7 +129,7 @@ static struct app_forwards *forwards_create_channel(struct app *app, ast_channel_topic_cached(chan), app->topic); if (!forwards->topic_cached_forward) { /* Half-subscribed is a bad thing */ - stasis_unsubscribe(forwards->topic_forward); + stasis_forward_cancel(forwards->topic_forward); forwards->topic_forward = NULL; return NULL; } @@ -163,7 +163,7 @@ static struct app_forwards *forwards_create_bridge(struct app *app, ast_bridge_topic_cached(bridge), app->topic); if (!forwards->topic_cached_forward) { /* Half-subscribed is a bad thing */ - stasis_unsubscribe(forwards->topic_forward); + stasis_forward_cancel(forwards->topic_forward); forwards->topic_forward = NULL; return NULL; } @@ -220,7 +220,7 @@ static void app_dtor(void *obj) } static void sub_default_handler(void *data, struct stasis_subscription *sub, - struct stasis_topic *topic, struct stasis_message *message) + struct stasis_message *message) { struct app *app = data; RAII_VAR(struct ast_json *, json, NULL, ast_json_unref); @@ -363,7 +363,6 @@ static channel_snapshot_monitor channel_monitors[] = { static void sub_channel_update_handler(void *data, struct stasis_subscription *sub, - struct stasis_topic *topic, struct stasis_message *message) { struct app *app = data; @@ -411,7 +410,6 @@ static struct ast_json *simple_bridge_event( static void sub_bridge_update_handler(void *data, struct stasis_subscription *sub, - struct stasis_topic *topic, struct stasis_message *message) { RAII_VAR(struct ast_json *, json, NULL, ast_json_unref); @@ -447,7 +445,7 @@ static void sub_bridge_update_handler(void *data, } static void bridge_merge_handler(void *data, struct stasis_subscription *sub, - struct stasis_topic *topic, struct stasis_message *message) + struct stasis_message *message) { struct app *app = data; struct ast_bridge_merge_message *merge; @@ -476,7 +474,7 @@ static void bridge_merge_handler(void *data, struct stasis_subscription *sub, } /* Forward the message to the app */ - stasis_forward_message(app->topic, topic, message); + stasis_publish(app->topic, message); } struct app *app_create(const char *name, stasis_app_cb handler, void *data) |