summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/parking/parking_applications.c2
-rw-r--r--res/parking/parking_bridge_features.c2
-rw-r--r--res/parking/parking_manager.c2
-rw-r--r--res/res_agi.c2
-rw-r--r--res/res_chan_stats.c6
-rw-r--r--res/res_jabber.c10
-rw-r--r--res/res_pjsip/include/res_pjsip_private.h1
-rw-r--r--res/res_pjsip_mwi.c4
-rw-r--r--res/res_pjsip_refer.c2
-rw-r--r--res/res_security_log.c2
-rw-r--r--res/res_stasis_test.c2
-rw-r--r--res/res_xmpp.c6
-rw-r--r--res/stasis/app.c20
13 files changed, 30 insertions, 31 deletions
diff --git a/res/parking/parking_applications.c b/res/parking/parking_applications.c
index fc74ac2be..7bd892266 100644
--- a/res/parking/parking_applications.c
+++ b/res/parking/parking_applications.c
@@ -739,7 +739,7 @@ announce_cleanup:
cap_slin = ast_format_cap_destroy(cap_slin);
}
-static void park_announce_update_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *message)
+static void park_announce_update_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message)
{
struct park_announce_subscription_data *pa_data = data;
char *dial_string = pa_data->dial_string;
diff --git a/res/parking/parking_bridge_features.c b/res/parking/parking_bridge_features.c
index 0e5e05d8f..6c1d4d65e 100644
--- a/res/parking/parking_bridge_features.c
+++ b/res/parking/parking_bridge_features.c
@@ -125,7 +125,7 @@ static void parker_parked_call_message_response(struct ast_parked_call_payload *
}
}
-static void parker_update_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *message)
+static void parker_update_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message)
{
if (stasis_subscription_final_message(sub, message)) {
ast_free(data);
diff --git a/res/parking/parking_manager.c b/res/parking/parking_manager.c
index dac191090..0c577018a 100644
--- a/res/parking/parking_manager.c
+++ b/res/parking/parking_manager.c
@@ -545,7 +545,7 @@ static void parked_call_message_response(struct ast_parked_call_payload *parked_
);
}
-static void parking_event_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *message)
+static void parking_event_cb(void *data, struct stasis_subscription *sub, struct stasis_message *message)
{
if (stasis_message_type(message) == ast_parked_call_type()) {
struct ast_parked_call_payload *parked_call_message = stasis_message_data(message);
diff --git a/res/res_agi.c b/res/res_agi.c
index 25251f37e..84dcbebe9 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -1040,7 +1040,7 @@ STASIS_MESSAGE_TYPE_DEFN_LOCAL(agi_async_exec_type);
STASIS_MESSAGE_TYPE_DEFN_LOCAL(agi_async_end_type);
static void agi_channel_manager_event(void *data,
- struct stasis_subscription *sub, struct stasis_topic *topic,
+ struct stasis_subscription *sub,
struct stasis_message *message)
{
const char *type = data;
diff --git a/res/res_chan_stats.c b/res/res_chan_stats.c
index a43c564b1..9d1e8c02e 100644
--- a/res/res_chan_stats.c
+++ b/res/res_chan_stats.c
@@ -57,7 +57,7 @@ static struct stasis_message_router *router;
* \param message The message itself.
*/
static void statsmaker(void *data, struct stasis_subscription *sub,
- struct stasis_topic *topic, struct stasis_message *message)
+ struct stasis_message *message)
{
RAII_VAR(struct ast_str *, metric, NULL, ast_free);
@@ -89,7 +89,7 @@ static void statsmaker(void *data, struct stasis_subscription *sub,
* \param message The message itself.
*/
static void updates(void *data, struct stasis_subscription *sub,
- struct stasis_topic *topic, struct stasis_message *message)
+ struct stasis_message *message)
{
/* Since this came from a message router, we know the type of the
* message. We can cast the data without checking its type.
@@ -139,7 +139,7 @@ static void updates(void *data, struct stasis_subscription *sub,
* \param message The message itself.
*/
static void default_route(void *data, struct stasis_subscription *sub,
- struct stasis_topic *topic, struct stasis_message *message)
+ struct stasis_message *message)
{
if (stasis_subscription_final_message(sub, message)) {
/* Much like with the regular subscription, you may need to
diff --git a/res/res_jabber.c b/res/res_jabber.c
index b534e803b..c1cee9b7a 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -371,8 +371,8 @@ static void aji_pubsub_purge_nodes(struct aji_client *client,
const char* collection_name);
static void aji_publish_mwi(struct aji_client *client, const char *mailbox,
const char *context, const char *oldmsgs, const char *newmsgs);
-static void aji_devstate_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg);
-static void aji_mwi_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg);
+static void aji_devstate_cb(void *data, struct stasis_subscription *sub, struct stasis_message *msg);
+static void aji_mwi_cb(void *data, struct stasis_subscription *sub, struct stasis_message *msg);
static iks* aji_build_publish_skeleton(struct aji_client *client, const char *node,
const char *event_type, unsigned int cachable);
/* No transports in this version */
@@ -3235,7 +3235,7 @@ int ast_aji_disconnect(struct aji_client *client)
* \param data void pointer to ast_client structure
* \return void
*/
-static void aji_mwi_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg)
+static void aji_mwi_cb(void *data, struct stasis_subscription *sub, struct stasis_message *msg)
{
const char *mailbox;
const char *context;
@@ -3269,7 +3269,7 @@ static void aji_mwi_cb(void *data, struct stasis_subscription *sub, struct stasi
* \param data void pointer to ast_client structure
* \return void
*/
-static void aji_devstate_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg)
+static void aji_devstate_cb(void *data, struct stasis_subscription *sub, struct stasis_message *msg)
{
struct aji_client *client = data;
struct ast_device_state_message *dev_state;
@@ -3291,7 +3291,7 @@ static int cached_devstate_cb(void *obj, void *arg, int flags)
{
struct stasis_message *msg = obj;
struct aji_client *client = arg;
- aji_devstate_cb(client, device_state_sub, NULL, msg);
+ aji_devstate_cb(client, device_state_sub, msg);
return 0;
}
diff --git a/res/res_pjsip/include/res_pjsip_private.h b/res/res_pjsip/include/res_pjsip_private.h
index 2b7a82b3f..c3e6c2192 100644
--- a/res/res_pjsip/include/res_pjsip_private.h
+++ b/res/res_pjsip/include/res_pjsip_private.h
@@ -9,6 +9,7 @@
#define RES_PJSIP_PRIVATE_H_
struct ao2_container;
+struct ast_threadpool_options;
/*!
* \brief Initialize the configuration for res_pjsip
diff --git a/res/res_pjsip_mwi.c b/res/res_pjsip_mwi.c
index e2b9b630d..17d648b74 100644
--- a/res/res_pjsip_mwi.c
+++ b/res/res_pjsip_mwi.c
@@ -118,7 +118,7 @@ struct mwi_subscription {
};
static void mwi_stasis_cb(void *userdata, struct stasis_subscription *sub,
- struct stasis_topic *topic, struct stasis_message *msg);
+ struct stasis_message *msg);
static struct mwi_stasis_subscription *mwi_stasis_subscription_alloc(const char *mailbox, struct mwi_subscription *mwi_sub)
{
@@ -603,7 +603,7 @@ static int serialized_cleanup(void *userdata)
}
static void mwi_stasis_cb(void *userdata, struct stasis_subscription *sub,
- struct stasis_topic *topic, struct stasis_message *msg)
+ struct stasis_message *msg)
{
struct mwi_subscription *mwi_sub = userdata;
diff --git a/res/res_pjsip_refer.c b/res/res_pjsip_refer.c
index cca5a7c39..91da22fde 100644
--- a/res/res_pjsip_refer.c
+++ b/res/res_pjsip_refer.c
@@ -143,7 +143,7 @@ static int refer_progress_notify(void *data)
}
static void refer_progress_bridge(void *data, struct stasis_subscription *sub,
- struct stasis_topic *topic, struct stasis_message *message)
+ struct stasis_message *message)
{
struct refer_progress *progress = data;
struct ast_bridge_blob *enter_blob;
diff --git a/res/res_security_log.c b/res/res_security_log.c
index d06f9f754..e56f7f76f 100644
--- a/res/res_security_log.c
+++ b/res/res_security_log.c
@@ -117,7 +117,7 @@ static void security_event_stasis_cb(struct ast_json *json)
}
static void security_stasis_cb(void *data, struct stasis_subscription *sub,
- struct stasis_topic *topic, struct stasis_message *message)
+ struct stasis_message *message)
{
struct ast_json_payload *payload = stasis_message_data(message);
diff --git a/res/res_stasis_test.c b/res/res_stasis_test.c
index 58df8c145..099e1af78 100644
--- a/res/res_stasis_test.c
+++ b/res/res_stasis_test.c
@@ -120,7 +120,7 @@ struct stasis_message_sink *stasis_message_sink_create(void)
* the initial lazy binding will still work as expected.
*/
static void message_sink_cb(void *data, struct stasis_subscription *sub,
- struct stasis_topic *topic, struct stasis_message *message)
+ struct stasis_message *message)
{
struct stasis_message_sink *sink = data;
diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index 1d8f62824..bd66e70cc 100644
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -1318,7 +1318,7 @@ static void xmpp_pubsub_publish_device_state(struct ast_xmpp_client *client, con
* \param data void pointer to ast_client structure
* \return void
*/
-static void xmpp_pubsub_mwi_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg)
+static void xmpp_pubsub_mwi_cb(void *data, struct stasis_subscription *sub, struct stasis_message *msg)
{
struct ast_xmpp_client *client = data;
const char *mailbox, *context;
@@ -1351,7 +1351,7 @@ static void xmpp_pubsub_mwi_cb(void *data, struct stasis_subscription *sub, stru
* \param data void pointer to ast_client structure
* \return void
*/
-static void xmpp_pubsub_devstate_cb(void *data, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg)
+static void xmpp_pubsub_devstate_cb(void *data, struct stasis_subscription *sub, struct stasis_message *msg)
{
struct ast_xmpp_client *client = data;
struct ast_device_state_message *dev_state;
@@ -1566,7 +1566,7 @@ static int cached_devstate_cb(void *obj, void *arg, int flags)
{
struct stasis_message *msg = obj;
struct ast_xmpp_client *client = arg;
- xmpp_pubsub_devstate_cb(client, client->device_state_sub, NULL, msg);
+ xmpp_pubsub_devstate_cb(client, client->device_state_sub, msg);
return 0;
}
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)
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 16:20:17 +0000