[asterisk-commits] dlee: branch dlee/stasis-res r384943 - in /team/dlee/stasis-res: apps/ includ...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Apr 8 10:57:35 CDT 2013
Author: dlee
Date: Mon Apr 8 10:57:31 2013
New Revision: 384943
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384943
Log:
Initial shuffling
Added:
team/dlee/stasis-res/include/asterisk/stasis_app.h
- copied, changed from r384912, team/dlee/stasis-res/include/asterisk/app_stasis.h
team/dlee/stasis-res/res/res_stasis.c
- copied, changed from r384912, team/dlee/stasis-res/apps/app_stasis.c
team/dlee/stasis-res/res/res_stasis.exports.in
- copied unchanged from r384912, team/dlee/stasis-res/apps/app_stasis.exports.in
team/dlee/stasis-res/tests/test_res_stasis.c
- copied, changed from r384912, team/dlee/stasis-res/tests/test_app_stasis.c
Removed:
team/dlee/stasis-res/apps/app_stasis.exports.in
team/dlee/stasis-res/apps/stasis_json.c
team/dlee/stasis-res/include/asterisk/app_stasis.h
team/dlee/stasis-res/tests/test_app_stasis.c
Modified:
team/dlee/stasis-res/apps/Makefile
team/dlee/stasis-res/apps/app_stasis.c
team/dlee/stasis-res/include/asterisk/stasis_channels.h
team/dlee/stasis-res/main/stasis_channels.c
team/dlee/stasis-res/res/res_stasis_websocket.c
Modified: team/dlee/stasis-res/apps/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-res/apps/Makefile?view=diff&rev=384943&r1=384942&r2=384943
==============================================================================
--- team/dlee/stasis-res/apps/Makefile (original)
+++ team/dlee/stasis-res/apps/Makefile Mon Apr 8 10:57:31 2013
@@ -37,5 +37,3 @@
LIBS+= -lres_features.so -lres_ael_share.so -lres_monitor.so -lres_speech.so
LIBS+= -lres_smdi.so
endif
-
-app_stasis.so: stasis_json.o
Modified: team/dlee/stasis-res/apps/app_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-res/apps/app_stasis.c?view=diff&rev=384943&r1=384942&r2=384943
==============================================================================
--- team/dlee/stasis-res/apps/app_stasis.c (original)
+++ team/dlee/stasis-res/apps/app_stasis.c Mon Apr 8 10:57:31 2013
@@ -24,6 +24,7 @@
*/
/*** MODULEINFO
+ <depend>res_stasis</depend>
<support_level>core</support_level>
***/
@@ -32,13 +33,13 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/app.h"
-#include "asterisk/app_stasis.h"
#include "asterisk/astobj2.h"
#include "asterisk/channel.h"
#include "asterisk/module.h"
#include "asterisk/stasis.h"
+#include "asterisk/stasis_app.h"
+#include "asterisk/stasis_channels.h"
#include "asterisk/strings.h"
-#include "asterisk/stasis_channels.h"
/*** DOCUMENTATION
<application name="Stasis" language="en_US">
@@ -48,7 +49,8 @@
<para>Name of the application to invoke.</para>
</parameter>
<parameter name="args">
- <para>Optional comma-delimited arguments for the application invocation.</para>
+ <para>Optional comma-delimited arguments for the
+ application invocation.</para>
</parameter>
</syntax>
<description>
@@ -65,321 +67,10 @@
/*! \brief Dialplan application name */
static const char *stasis = "Stasis";
-/*!
- * \brief Number of buckets for the Stasis application hash table. Remember to
- * keep it a prime number!
- */
-#define APPS_NUM_BUCKETS 127
-
-/*!
- * \brief Number of buckets for the Stasis application hash table. Remember to
- * keep it a prime number!
- */
-#define CONTROLS_NUM_BUCKETS 127
-
-/*!
- * \brief Stasis application container. Please call apps_registry() instead of
- * directly accessing.
- */
-struct ao2_container *__apps_registry;
-
-struct ao2_container *__app_controls;
-
-/*! Ref-counting accessor for the stasis applications container */
-static struct ao2_container *apps_registry(void)
+/*! /brief Stasis dialplan application callback */
+static int app_exec(struct ast_channel *chan, const char *data)
{
- ao2_ref(__apps_registry, +1);
- return __apps_registry;
-}
-
-static struct ao2_container *app_controls(void)
-{
- ao2_ref(__app_controls, +1);
- return __app_controls;
-}
-
-struct app {
- /*! Callback function for this application. */
- stasis_app_cb handler;
- /*! Opaque data to hand to callback function. */
- void *data;
- /*! Name of the Stasis application */
- char name[];
-};
-
-static void app_dtor(void *obj)
-{
- struct app *app = obj;
-
- ao2_cleanup(app->data);
- app->data = NULL;
-}
-
-/*! Constructor for \ref app. */
-static struct app *app_create(const char *name, stasis_app_cb handler, void *data)
-{
- struct app *app;
- size_t size;
-
- ast_assert(name != NULL);
- ast_assert(handler != NULL);
-
- size = sizeof(*app) + strlen(name) + 1;
- app = ao2_alloc_options(size, app_dtor, AO2_ALLOC_OPT_LOCK_MUTEX);
-
- if (!app) {
- return NULL;
- }
-
- strncpy(app->name, name, size - sizeof(*app));
- app->handler = handler;
- ao2_ref(data, +1);
- app->data = data;
-
- return app;
-}
-
-/*! AO2 hash function for \ref app */
-static int app_hash(const void *obj, const int flags)
-{
- const struct app *app = obj;
- const char *name = flags & OBJ_KEY ? obj : app->name;
-
- return ast_str_hash(name);
-}
-
-/*! AO2 comparison function for \ref app */
-static int app_compare(void *lhs, void *rhs, int flags)
-{
- const struct app *lhs_app = lhs;
- const struct app *rhs_app = rhs;
- const char *rhs_name = flags & OBJ_KEY ? rhs : rhs_app->name;
-
- if (strcmp(lhs_app->name, rhs_name) == 0) {
- return CMP_MATCH | CMP_STOP;
- } else {
- return 0;
- }
-}
-
-/*!
- * \brief Send a message to the given application.
- * \param app App to send the message to.
- * \param message Message to send.
- */
-static void app_send(struct app *app, struct ast_json *message)
-{
- app->handler(app->data, app->name, message);
-}
-
-struct stasis_app_control {
- /*!
- * When set, /c app_stasis should exit and continue in the dialplan.
- */
- int continue_to_dialplan:1;
- /*! Uniqueid of the associated channel */
- char channel_uniqueid[];
-};
-
-static struct stasis_app_control *control_create(const char *uniqueid)
-{
- struct stasis_app_control *control;
- size_t size;
-
- size = sizeof(*control) + strlen(uniqueid) + 1;
- control = ao2_alloc(size, NULL);
- if (!control) {
- return NULL;
- }
-
- strncpy(control->channel_uniqueid, uniqueid, size - sizeof(*control));
-
- return control;
-}
-
-struct stasis_app_control *stasis_app_control_find_by_channel(
- const struct ast_channel *chan)
-{
- RAII_VAR(struct ao2_container *, controls, NULL, ao2_cleanup);
- if (chan == NULL) {
- return NULL;
- }
-
- controls = app_controls();
- return ao2_find(controls, ast_channel_uniqueid(chan), OBJ_KEY);
-}
-
-/*!
- * \brief Test the \c continue_to_dialplan bit for the given \a app.
- *
- * The bit is also reset for the next call.
- *
- * \param app Application to check the \c continue_to_dialplan bit.
- * \return Zero to remain in \c Stasis
- * \return Non-zero to continue in the dialplan
- */
-static int control_continue_test_and_reset(struct stasis_app_control *control)
-{
- int r;
- SCOPED_AO2LOCK(lock, control);
-
- r = control->continue_to_dialplan;
- control->continue_to_dialplan = 0;
- return r;
-}
-
-void stasis_app_control_continue(struct stasis_app_control *control)
-{
- SCOPED_AO2LOCK(lock, control);
- control->continue_to_dialplan = 1;
-}
-
-static struct ast_json *app_event_create(
- const char *event_name,
- const struct ast_channel_snapshot *snapshot,
- const struct ast_json *extra_info)
-{
- RAII_VAR(struct ast_json *, message, NULL, ast_json_unref);
- RAII_VAR(struct ast_json *, event, NULL, ast_json_unref);
-
- if (extra_info) {
- event = ast_json_deep_copy(extra_info);
- } else {
- event = ast_json_object_create();
- }
-
- if (snapshot) {
- int ret;
-
- /* Mustn't already have a channel field */
- ast_assert(ast_json_object_get(event, "channel") == NULL);
-
- ret = ast_json_object_set(
- event,
- "channel", ast_channel_snapshot_to_json(snapshot));
- if (ret != 0) {
- return NULL;
- }
- }
-
- message = ast_json_pack("{s: o}", event_name, ast_json_ref(event));
-
- return ast_json_ref(message);
-}
-
-static int send_start_msg(struct app *app, struct ast_channel *chan,
- int argc, char *argv[])
-{
- RAII_VAR(struct ast_json *, msg, NULL, ast_json_unref);
- RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
-
- struct ast_json *json_args;
- int i;
-
- ast_assert(chan != NULL);
-
- /* Set channel info */
- snapshot = ast_channel_snapshot_create(chan);
- if (!snapshot) {
- return -1;
- }
-
- msg = ast_json_pack("{s: {s: [], s: o}}",
- "stasis-start",
- "args",
- "channel", ast_channel_snapshot_to_json(snapshot));
-
- if (!msg) {
- return -1;
- }
-
- /* Append arguments to args array */
- json_args = ast_json_object_get(
- ast_json_object_get(msg, "stasis-start"),
- "args");
- ast_assert(json_args != NULL);
- for (i = 0; i < argc; ++i) {
- int r = ast_json_array_append(json_args,
- ast_json_string_create(argv[i]));
- if (r != 0) {
- ast_log(LOG_ERROR, "Error appending start message\n");
- return -1;
- }
- }
-
- app_send(app, msg);
- return 0;
-}
-
-static int send_end_msg(struct app *app, struct ast_channel *chan)
-{
- RAII_VAR(struct ast_json *, msg, NULL, ast_json_unref);
- RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
-
- ast_assert(chan != NULL);
-
- /* Set channel info */
- snapshot = ast_channel_snapshot_create(chan);
- if (snapshot == NULL) {
- return -1;
- }
- msg = app_event_create("stasis-end", snapshot, NULL);
- if (!msg) {
- return -1;
- }
-
- app_send(app, msg);
- return 0;
-}
-
-static void sub_handler(void *data, struct stasis_subscription *sub,
- struct stasis_topic *topic,
- struct stasis_message *message)
-{
- struct app *app = data;
- if (ast_channel_snapshot_type() == stasis_message_type(message)) {
- RAII_VAR(struct ast_json *, msg, NULL, ast_json_unref);
- struct ast_channel_snapshot *snapshot =
- stasis_message_data(message);
-
- msg = app_event_create("channel-state-change", snapshot, NULL);
- if (!msg) {
- return;
- }
- app_send(app, msg);
- }
- if (stasis_subscription_final_message(sub, message)) {
- ao2_cleanup(data);
- }
-}
-
-/*!
- * \brief In addition to running ao2_cleanup(), this function also removes the
- * object from the app_controls() container.
- */
-static void control_unlink(struct stasis_app_control *control)
-{
- RAII_VAR(struct ao2_container *, controls, NULL, ao2_cleanup);
-
- if (!control) {
- return;
- }
-
- controls = app_controls();
- ao2_unlink_flags(controls, control, OBJ_POINTER | OBJ_UNLINK | OBJ_NODATA);
- ao2_cleanup(control);
-}
-
-/*! /brief Stasis dialplan application callback */
-static int app_stasis_exec(struct ast_channel *chan, const char *data)
-{
- RAII_VAR(struct ao2_container *, apps, apps_registry(), ao2_cleanup);
- RAII_VAR(struct app *, app, NULL, ao2_cleanup);
- RAII_VAR(struct stasis_app_control *, control, NULL, control_unlink);
- RAII_VAR(struct stasis_subscription *, subscription, NULL, stasis_unsubscribe);
- int res = 0;
char *parse = NULL;
- int hungup = 0;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(app_name);
@@ -398,142 +89,15 @@
return -1;
}
- app = ao2_find(apps, args.app_name, OBJ_KEY);
- if (!app) {
- ast_log(LOG_ERROR, "Stasis app '%s' not registered\n", args.app_name);
- return -1;
- }
-
- {
- RAII_VAR(struct ao2_container *, controls, NULL, ao2_cleanup);
-
- controls = app_controls();
- control = control_create(ast_channel_uniqueid(chan));
- if (!control) {
- ast_log(LOG_ERROR, "Allocated failed\n");
- return -1;
- }
- ao2_link(controls, control);
- }
-
- subscription = stasis_subscribe(ast_channel_topic(chan), sub_handler, app);
- if (subscription == NULL) {
- ast_log(LOG_ERROR, "Error subscribing app %s to channel %s\n", args.app_name, ast_channel_name(chan));
- return -1;
- }
- ao2_ref(app, +1); /* subscription now has a reference */
-
- res = send_start_msg(app, chan, args.argc - 1, args.app_argv);
- if (res != 0) {
- ast_log(LOG_ERROR, "Error sending start message to %s\n", args.app_name);
- return res;
- }
-
- while (!hungup && !control_continue_test_and_reset(control) && ast_waitfor(chan, -1) > -1) {
- RAII_VAR(struct ast_frame *, f, ast_read(chan), ast_frame_dtor);
- if (!f) {
- ast_debug(3, "%s: No more frames. Must be done, I guess.\n", ast_channel_uniqueid(chan));
- break;
- }
-
- switch (f->frametype) {
- case AST_FRAME_CONTROL:
- if (f->subclass.integer == AST_CONTROL_HANGUP) {
- ast_debug(3, "%s: Received hangup\n", ast_channel_uniqueid(chan));
- hungup = 1;
- }
- break;
- default:
- /* Not handled; discard */
- break;
- }
- }
-
- res = send_end_msg(app, chan);
- if (res != 0) {
- ast_log(LOG_ERROR, "Error sending end message to %s\n", args.app_name);
- return res;
- }
-
- return res;
-}
-
-int stasis_app_send(const char *app_name, struct ast_json *message)
-{
- RAII_VAR(struct ao2_container *, apps, apps_registry(), ao2_cleanup);
- RAII_VAR(struct app *, app, NULL, ao2_cleanup);
-
- app = ao2_find(apps, app_name, OBJ_KEY);
-
- if (!app) {
- /* XXX We can do a better job handling late binding, queueing up the call for a few seconds
- * to wait for the app to register.
- */
- ast_log(LOG_WARNING, "Stasis app '%s' not registered\n", app_name);
- return -1;
- }
-
- app_send(app, message);
- return 0;
-}
-
-int stasis_app_register(const char *app_name, stasis_app_cb handler, void *data)
-{
- RAII_VAR(struct ao2_container *, apps, apps_registry(), ao2_cleanup);
- RAII_VAR(struct app *, app, NULL, ao2_cleanup);
-
- SCOPED_LOCK(apps_lock, apps, ao2_lock, ao2_unlock);
-
- app = ao2_find(apps, app_name, OBJ_KEY | OBJ_NOLOCK);
-
- if (app) {
- RAII_VAR(struct ast_json *, msg, NULL, ast_json_unref);
- SCOPED_LOCK(app_lock, app, ao2_lock, ao2_unlock);
-
- msg = app_event_create("application-replaced", NULL, NULL);
- app->handler(app->data, app_name, msg);
-
- app->handler = handler;
- ao2_cleanup(app->data);
- ao2_ref(data, +1);
- app->data = data;
- } else {
- app = app_create(app_name, handler, data);
- if (app) {
- ao2_link_flags(apps, app, OBJ_NOLOCK);
- } else {
- return -1;
- }
- }
-
- return 0;
-}
-
-void stasis_app_unregister(const char *app_name)
-{
- RAII_VAR(struct ao2_container *, apps, NULL, ao2_cleanup);
-
- if (app_name) {
- apps = apps_registry();
- ao2_cleanup(ao2_find(apps, app_name, OBJ_KEY | OBJ_UNLINK));
- }
+ return stasis_app_exec(
+ chan, args.app_name, args.argc - 1, args.app_argv);
}
static int load_module(void)
{
int r = 0;
- __apps_registry = ao2_container_alloc(APPS_NUM_BUCKETS, app_hash, app_compare);
- if (__apps_registry == NULL) {
- return AST_MODULE_LOAD_FAILURE;
- }
-
- __app_controls = ao2_container_alloc(CONTROLS_NUM_BUCKETS, app_hash, app_compare);
- if (__app_controls == NULL) {
- return AST_MODULE_LOAD_FAILURE;
- }
-
- r |= ast_register_application_xml(stasis, app_stasis_exec);
+ r |= ast_register_application_xml(stasis, app_exec);
return r;
}
@@ -541,16 +105,11 @@
{
int r = 0;
- ao2_cleanup(__apps_registry);
- __apps_registry = NULL;
-
- ao2_cleanup(__app_controls);
- __app_controls = NULL;
-
r |= ast_unregister_application(stasis);
return r;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis dialplan application",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS,
+ "Stasis dialplan application",
.load = load_module,
.unload = unload_module);
Copied: team/dlee/stasis-res/include/asterisk/stasis_app.h (from r384912, team/dlee/stasis-res/include/asterisk/app_stasis.h)
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-res/include/asterisk/stasis_app.h?view=diff&rev=384943&p1=team/dlee/stasis-res/include/asterisk/app_stasis.h&r1=384912&p2=team/dlee/stasis-res/include/asterisk/stasis_app.h&r2=384943
==============================================================================
--- team/dlee/stasis-res/include/asterisk/app_stasis.h (original)
+++ team/dlee/stasis-res/include/asterisk/stasis_app.h Mon Apr 8 10:57:31 2013
@@ -21,21 +21,21 @@
/*! \file
*
- * \brief Stasis Application API. See \ref app_stasis "Stasis Application API"
+ * \brief Stasis Application API. See \ref res_stasis "Stasis Application API"
* for detailed documentation.
*
* \author David M. Lee, II <dlee at digium.com>
* \since 12
*
- * \page app_stasis Stasis Application API
+ * \page res_stasis Stasis Application API
*
* This is the API that binds the Stasis dialplan application to external
* Stasis applications, such as \c res_stasis_websocket.
*
- * This module registers a dialplan function named \c Stasis, which is used to
- * put a channel into the named Stasis app. As a channel enters and leaves the
- * Stasis diaplan applcation, the Stasis app receives a \c 'stasis-start' and \c
- * 'stasis-end' events.
+ * The associated \c res_stasis module registers a dialplan function named \c
+ * Stasis, which uses \c res_stasis to put a channel into the named Stasis
+ * app. As a channel enters and leaves the Stasis diaplan application, the
+ * Stasis app receives a \c 'stasis-start' and \c 'stasis-end' events.
*
* Stasis apps register themselves using the \ref stasis_app_register and
* stasis_app_unregister functions. Messages are sent to an appliction using
@@ -50,6 +50,25 @@
#include "asterisk/json.h"
struct ast_channel_snapshot;
+
+/*! @{ */
+
+/*!
+ * \brief Control a channel using \c stasis_app.
+ *
+ * This function blocks until the channel hangs up, or
+ * stasis_app_control_continue() is called on the channel's \ref
+ * stasis_app_control struct.
+ *
+ * \param chan Channel to control with Stasis.
+ * \param app_name Application controlling the channel.
+ * \param argc Number of arguments for the application.
+ * \param argv Arguments for the application.
+ */
+int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
+ char *argv[]);
+
+/*! @} */
/*! @{ */
@@ -110,7 +129,7 @@
* \brief Returns the handler for the given channel
* \param chan Channel to handle.
* \return NULL channel not in Stasis application
- * \return Pointer to app_stasis handler.
+ * \return Pointer to stasis handler.
*/
struct stasis_app_control *stasis_app_control_find_by_channel(
const struct ast_channel *chan);
@@ -128,12 +147,6 @@
/*! @{ */
-/*!
- * \brief Build a JSON object from a \ref ast_channel_snapshot.
- * \return JSON object representing channel snapshot.
- * \return \c NULL on error
- */
-struct ast_json *ast_channel_snapshot_to_json(const struct ast_channel_snapshot *snapshot);
/*! @} */
Modified: team/dlee/stasis-res/include/asterisk/stasis_channels.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-res/include/asterisk/stasis_channels.h?view=diff&rev=384943&r1=384942&r2=384943
==============================================================================
--- team/dlee/stasis-res/include/asterisk/stasis_channels.h (original)
+++ team/dlee/stasis-res/include/asterisk/stasis_channels.h Mon Apr 8 10:57:31 2013
@@ -292,6 +292,13 @@
/*! @} */
/*!
+ * \brief Build a JSON object from a \ref ast_channel_snapshot.
+ * \return JSON object representing channel snapshot.
+ * \return \c NULL on error
+ */
+struct ast_json *ast_channel_snapshot_to_json(const struct ast_channel_snapshot *snapshot);
+
+/*!
* \brief Dispose of the stasis channel topics and message types
*/
void ast_stasis_channels_shutdown(void);
Modified: team/dlee/stasis-res/main/stasis_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-res/main/stasis_channels.c?view=diff&rev=384943&r1=384942&r2=384943
==============================================================================
--- team/dlee/stasis-res/main/stasis_channels.c (original)
+++ team/dlee/stasis-res/main/stasis_channels.c Mon Apr 8 10:57:31 2013
@@ -455,6 +455,52 @@
publish_message_for_channel_topics(msg, chan);
}
+struct ast_json *ast_channel_snapshot_to_json(const struct ast_channel_snapshot *snapshot)
+{
+ RAII_VAR(struct ast_json *, json_chan, NULL, ast_json_unref);
+ int r = 0;
+
+ if (snapshot == NULL) {
+ return NULL;
+ }
+
+ json_chan = ast_json_object_create();
+ if (!json_chan) { ast_log(LOG_ERROR, "Error creating channel json object\n"); return NULL; }
+
+ r = ast_json_object_set(json_chan, "name", ast_json_string_create(snapshot->name));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "state", ast_json_string_create(ast_state2str(snapshot->state)));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "accountcode", ast_json_string_create(snapshot->accountcode));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "peeraccount", ast_json_string_create(snapshot->peeraccount));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "userfield", ast_json_string_create(snapshot->userfield));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "uniqueid", ast_json_string_create(snapshot->uniqueid));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "linkedid", ast_json_string_create(snapshot->linkedid));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "parkinglot", ast_json_string_create(snapshot->parkinglot));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "hangupsource", ast_json_string_create(snapshot->hangupsource));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "appl", ast_json_string_create(snapshot->appl));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "data", ast_json_string_create(snapshot->data));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "dialplan", ast_json_dialplan_cep(snapshot->context, snapshot->exten, snapshot->priority));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "caller", ast_json_name_number(snapshot->caller_name, snapshot->caller_number));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "connected", ast_json_name_number(snapshot->connected_name, snapshot->connected_number));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+ r = ast_json_object_set(json_chan, "creationtime", ast_json_timeval(&snapshot->creationtime, NULL));
+ if (r) { ast_log(LOG_ERROR, "Error adding attrib to channel json object\n"); return NULL; }
+
+ return ast_json_ref(json_chan);
+}
+
void ast_stasis_channels_shutdown(void)
{
ao2_cleanup(channel_snapshot_type);
Copied: team/dlee/stasis-res/res/res_stasis.c (from r384912, team/dlee/stasis-res/apps/app_stasis.c)
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-res/res/res_stasis.c?view=diff&rev=384943&p1=team/dlee/stasis-res/apps/app_stasis.c&r1=384912&p2=team/dlee/stasis-res/res/res_stasis.c&r2=384943
==============================================================================
--- team/dlee/stasis-res/apps/app_stasis.c (original)
+++ team/dlee/stasis-res/res/res_stasis.c Mon Apr 8 10:57:31 2013
@@ -18,7 +18,7 @@
/*! \file
*
- * \brief Stasis dialplan application.
+ * \brief Stasis application support.
*
* \author David M. Lee, II <dlee at digium.com>
*/
@@ -31,39 +31,13 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/app.h"
-#include "asterisk/app_stasis.h"
#include "asterisk/astobj2.h"
#include "asterisk/channel.h"
#include "asterisk/module.h"
#include "asterisk/stasis.h"
+#include "asterisk/stasis_app.h"
+#include "asterisk/stasis_channels.h"
#include "asterisk/strings.h"
-#include "asterisk/stasis_channels.h"
-
-/*** DOCUMENTATION
- <application name="Stasis" language="en_US">
- <synopsis>Invoke an external Stasis application.</synopsis>
- <syntax>
- <parameter name="app_name" required="true">
- <para>Name of the application to invoke.</para>
- </parameter>
- <parameter name="args">
- <para>Optional comma-delimited arguments for the application invocation.</para>
- </parameter>
- </syntax>
- <description>
- <para>
- Invoke a Stasis application.
- </para>
- </description>
- </application>
- ***/
-
-/*! \brief Maximum number of arguments for the Stasis dialplan application */
-#define MAX_ARGS 128
-
-/*! \brief Dialplan application name */
-static const char *stasis = "Stasis";
/*!
* \brief Number of buckets for the Stasis application hash table. Remember to
@@ -371,36 +345,21 @@
}
/*! /brief Stasis dialplan application callback */
-static int app_stasis_exec(struct ast_channel *chan, const char *data)
+int stasis_app_exec(struct ast_channel *chan, const char *app_name, int argc,
+ char *argv[])
{
RAII_VAR(struct ao2_container *, apps, apps_registry(), ao2_cleanup);
RAII_VAR(struct app *, app, NULL, ao2_cleanup);
RAII_VAR(struct stasis_app_control *, control, NULL, control_unlink);
RAII_VAR(struct stasis_subscription *, subscription, NULL, stasis_unsubscribe);
int res = 0;
- char *parse = NULL;
int hungup = 0;
- AST_DECLARE_APP_ARGS(args,
- AST_APP_ARG(app_name);
- AST_APP_ARG(app_argv)[MAX_ARGS];
- );
-
ast_assert(chan != NULL);
- ast_assert(data != NULL);
-
- /* parse the arguments */
- parse = ast_strdupa(data);
- AST_STANDARD_APP_ARGS(args, parse);
-
- if (args.argc < 1) {
- ast_log(LOG_WARNING, "Stasis app_name argument missing\n");
- return -1;
- }
-
- app = ao2_find(apps, args.app_name, OBJ_KEY);
+
+ app = ao2_find(apps, app_name, OBJ_KEY);
if (!app) {
- ast_log(LOG_ERROR, "Stasis app '%s' not registered\n", args.app_name);
+ ast_log(LOG_ERROR, "Stasis app '%s' not registered\n", app_name);
return -1;
}
@@ -418,14 +377,14 @@
subscription = stasis_subscribe(ast_channel_topic(chan), sub_handler, app);
if (subscription == NULL) {
- ast_log(LOG_ERROR, "Error subscribing app %s to channel %s\n", args.app_name, ast_channel_name(chan));
+ ast_log(LOG_ERROR, "Error subscribing app %s to channel %s\n", app_name, ast_channel_name(chan));
return -1;
}
ao2_ref(app, +1); /* subscription now has a reference */
- res = send_start_msg(app, chan, args.argc - 1, args.app_argv);
+ res = send_start_msg(app, chan, argc, argv);
if (res != 0) {
- ast_log(LOG_ERROR, "Error sending start message to %s\n", args.app_name);
+ ast_log(LOG_ERROR, "Error sending start message to %s\n", app_name);
return res;
}
@@ -451,7 +410,7 @@
res = send_end_msg(app, chan);
if (res != 0) {
- ast_log(LOG_ERROR, "Error sending end message to %s\n", args.app_name);
+ ast_log(LOG_ERROR, "Error sending end message to %s\n", app_name);
return res;
}
@@ -533,7 +492,6 @@
return AST_MODULE_LOAD_FAILURE;
}
- r |= ast_register_application_xml(stasis, app_stasis_exec);
return r;
}
@@ -547,10 +505,10 @@
ao2_cleanup(__app_controls);
__app_controls = NULL;
- r |= ast_unregister_application(stasis);
return r;
}
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis dialplan application",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS,
+ "Stasis application support",
.load = load_module,
.unload = unload_module);
Modified: team/dlee/stasis-res/res/res_stasis_websocket.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-res/res/res_stasis_websocket.c?view=diff&rev=384943&r1=384942&r2=384943
==============================================================================
--- team/dlee/stasis-res/res/res_stasis_websocket.c (original)
+++ team/dlee/stasis-res/res/res_stasis_websocket.c Mon Apr 8 10:57:31 2013
@@ -33,11 +33,11 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include "asterisk/app_stasis.h"
#include "asterisk/astobj2.h"
#include "asterisk/http_websocket.h"
#include "asterisk/json.h"
#include "asterisk/module.h"
+#include "asterisk/stasis_app.h"
#include "asterisk/strings.h"
#include "asterisk/utils.h"
Copied: team/dlee/stasis-res/tests/test_res_stasis.c (from r384912, team/dlee/stasis-res/tests/test_app_stasis.c)
URL: http://svnview.digium.com/svn/asterisk/team/dlee/stasis-res/tests/test_res_stasis.c?view=diff&rev=384943&p1=team/dlee/stasis-res/tests/test_app_stasis.c&r1=384912&p2=team/dlee/stasis-res/tests/test_res_stasis.c&r2=384943
==============================================================================
--- team/dlee/stasis-res/tests/test_app_stasis.c (original)
+++ team/dlee/stasis-res/tests/test_res_stasis.c Mon Apr 8 10:57:31 2013
@@ -25,7 +25,7 @@
/*** MODULEINFO
<depend>TEST_FRAMEWORK</depend>
- <depend>app_stasis</depend>
+ <depend>res_stasis</depend>
<support_level>core</support_level>
***/
@@ -35,9 +35,9 @@
#include "asterisk/module.h"
#include "asterisk/test.h"
-#include "asterisk/app_stasis.h"
+#include "asterisk/stasis_app.h"
-static const char *test_category = "/stasis/app/";
+static const char *test_category = "/stasis/res/";
AST_TEST_DEFINE(app_invoke_dne)
{
More information about the asterisk-commits
mailing list