[asterisk-commits] dlee: branch dlee/tp-local r399825 - in /team/dlee/tp-local: channels/ main/ ...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Sep 25 15:25:23 CDT 2013
Author: dlee
Date: Wed Sep 25 15:25:19 2013
New Revision: 399825
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399825
Log:
How could I have missed all those?
Modified:
team/dlee/tp-local/channels/chan_dahdi.c
team/dlee/tp-local/channels/sig_pri.c
team/dlee/tp-local/main/manager_endpoints.c
team/dlee/tp-local/main/manager_mwi.c
team/dlee/tp-local/main/pbx.c
team/dlee/tp-local/main/sounds_index.c
team/dlee/tp-local/main/stasis_wait.c
team/dlee/tp-local/res/res_agi.c
team/dlee/tp-local/res/res_pjsip_mwi.c
team/dlee/tp-local/res/res_pjsip_refer.c
team/dlee/tp-local/res/res_stasis_test.c
team/dlee/tp-local/res/res_xmpp.c
team/dlee/tp-local/res/stasis/app.c
Modified: team/dlee/tp-local/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/channels/chan_dahdi.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/channels/chan_dahdi.c (original)
+++ team/dlee/tp-local/channels/chan_dahdi.c Wed Sep 25 15:25:19 2013
@@ -553,7 +553,7 @@
static int dahdi_sendtext(struct ast_channel *c, const char *text);
-static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg)
+static void mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_message *msg)
{
/* This module does not handle MWI in an event-based manner. However, it
* subscribes to MWI for each mailbox that is configured so that the core
Modified: team/dlee/tp-local/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/channels/sig_pri.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/channels/sig_pri.c (original)
+++ team/dlee/tp-local/channels/sig_pri.c Wed Sep 25 15:25:19 2013
@@ -8892,7 +8892,7 @@
*
* \return Nothing
*/
-static void sig_pri_mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg)
+static void sig_pri_mwi_event_cb(void *userdata, struct stasis_subscription *sub, struct stasis_message *msg)
{
struct sig_pri_span *pri = userdata;
const char *mbox_context;
Modified: team/dlee/tp-local/main/manager_endpoints.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/main/manager_endpoints.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/main/manager_endpoints.c (original)
+++ team/dlee/tp-local/main/manager_endpoints.c Wed Sep 25 15:25:19 2013
@@ -46,14 +46,9 @@
}
static void endpoint_state_cb(void *data, struct stasis_subscription *sub,
- struct stasis_topic *topic,
struct stasis_message *message)
{
- /* XXX This looks wrong. Nothing should post or forward to a caching
- * topic directly. Maybe ast_endpoint_topic() would be correct? I'd have
- * to dig to make sure I don't break anything, though.
- */
- stasis_forward_message(ast_manager_get_topic(), ast_endpoint_topic_all_cached(), message);
+ stasis_publish(ast_manager_get_topic(), message);
}
int manager_endpoints_init(void)
Modified: team/dlee/tp-local/main/manager_mwi.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/main/manager_mwi.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/main/manager_mwi.c (original)
+++ team/dlee/tp-local/main/manager_mwi.c Wed Sep 25 15:25:19 2013
@@ -54,7 +54,6 @@
/*! \brief Generic MWI event callback used for one-off events from voicemail modules */
static void mwi_app_event_cb(void *data, struct stasis_subscription *sub,
- struct stasis_topic *topic,
struct stasis_message *message)
{
struct ast_mwi_blob *payload = stasis_message_data(message);
@@ -86,7 +85,6 @@
}
static void mwi_update_cb(void *data, struct stasis_subscription *sub,
- struct stasis_topic *topic,
struct stasis_message *message)
{
struct ast_mwi_state *mwi_state;
Modified: team/dlee/tp-local/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/main/pbx.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/main/pbx.c (original)
+++ team/dlee/tp-local/main/pbx.c Wed Sep 25 15:25:19 2013
@@ -5111,7 +5111,7 @@
ao2_iterator_destroy(&iter);
}
-static void device_state_cb(void *unused, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg)
+static void device_state_cb(void *unused, struct stasis_subscription *sub, struct stasis_message *msg)
{
struct ast_device_state_message *dev_state;
struct ast_hint *hint;
@@ -11371,7 +11371,7 @@
return res;
}
-static void presence_state_cb(void *unused, struct stasis_subscription *sub, struct stasis_topic *topic, struct stasis_message *msg)
+static void presence_state_cb(void *unused, struct stasis_subscription *sub, struct stasis_message *msg)
{
struct ast_presence_state_message *presence_state = stasis_message_data(msg);
struct ast_hint *hint;
Modified: team/dlee/tp-local/main/sounds_index.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/main/sounds_index.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/main/sounds_index.c (original)
+++ team/dlee/tp-local/main/sounds_index.c Wed Sep 25 15:25:19 2013
@@ -281,7 +281,7 @@
}
static void format_update_cb(void *data, struct stasis_subscription *sub,
- struct stasis_topic *topic, struct stasis_message *message)
+ struct stasis_message *message)
{
ast_sounds_reindex();
}
Modified: team/dlee/tp-local/main/stasis_wait.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/main/stasis_wait.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/main/stasis_wait.c (original)
+++ team/dlee/tp-local/main/stasis_wait.c Wed Sep 25 15:25:19 2013
@@ -55,7 +55,7 @@
}
static void guarantee_handler(void *data, struct stasis_subscription *sub,
- struct stasis_topic *topic, struct stasis_message *message)
+ struct stasis_message *message)
{
/* Wait for our particular message */
if (data == message) {
Modified: team/dlee/tp-local/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/res/res_agi.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/res/res_agi.c (original)
+++ team/dlee/tp-local/res/res_agi.c Wed Sep 25 15:25:19 2013
@@ -1040,7 +1040,7 @@
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;
Modified: team/dlee/tp-local/res/res_pjsip_mwi.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/res/res_pjsip_mwi.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/res/res_pjsip_mwi.c (original)
+++ team/dlee/tp-local/res/res_pjsip_mwi.c Wed Sep 25 15:25:19 2013
@@ -118,7 +118,7 @@
};
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 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;
Modified: team/dlee/tp-local/res/res_pjsip_refer.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/res/res_pjsip_refer.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/res/res_pjsip_refer.c (original)
+++ team/dlee/tp-local/res/res_pjsip_refer.c Wed Sep 25 15:25:19 2013
@@ -143,7 +143,7 @@
}
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;
Modified: team/dlee/tp-local/res/res_stasis_test.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/res/res_stasis_test.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/res/res_stasis_test.c (original)
+++ team/dlee/tp-local/res/res_stasis_test.c Wed Sep 25 15:25:19 2013
@@ -120,7 +120,7 @@
* 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;
Modified: team/dlee/tp-local/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/res/res_xmpp.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/res/res_xmpp.c (original)
+++ team/dlee/tp-local/res/res_xmpp.c Wed Sep 25 15:25:19 2013
@@ -1318,7 +1318,7 @@
* \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 @@
* \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 @@
{
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;
}
Modified: team/dlee/tp-local/res/stasis/app.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/tp-local/res/stasis/app.c?view=diff&rev=399825&r1=399824&r2=399825
==============================================================================
--- team/dlee/tp-local/res/stasis/app.c (original)
+++ team/dlee/tp-local/res/stasis/app.c Wed Sep 25 15:25:19 2013
@@ -220,7 +220,7 @@
}
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 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 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 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 @@
}
/* 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)
More information about the asterisk-commits
mailing list