[asterisk-commits] dlee: branch dlee/playback r387618 - in /team/dlee/playback: apps/ include/as...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri May 3 14:42:07 CDT 2013
Author: dlee
Date: Fri May 3 14:42:04 2013
New Revision: 387618
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=387618
Log:
Lots of typing. At least it compiles.
Added:
team/dlee/playback/include/asterisk/stasis_app_impl.h (with props)
team/dlee/playback/include/asterisk/stasis_app_playback.h (with props)
team/dlee/playback/res/res_stasis_playback.c (with props)
team/dlee/playback/res/res_stasis_playback.exports.in (with props)
team/dlee/playback/res/stasis/ (with props)
team/dlee/playback/res/stasis/answer.c (with props)
team/dlee/playback/res/stasis/app.c (with props)
team/dlee/playback/res/stasis/app.h (with props)
team/dlee/playback/res/stasis/command.c (with props)
team/dlee/playback/res/stasis/command.h (with props)
team/dlee/playback/res/stasis/control.c (with props)
team/dlee/playback/res/stasis/control.h (with props)
Modified:
team/dlee/playback/apps/app_stasis.c
team/dlee/playback/include/asterisk/file.h
team/dlee/playback/include/asterisk/module.h
team/dlee/playback/include/asterisk/stasis_app.h
team/dlee/playback/include/asterisk/stasis_channels.h
team/dlee/playback/include/asterisk/stasis_http.h
team/dlee/playback/main/channel.c
team/dlee/playback/main/channel_internal_api.c
team/dlee/playback/main/file.c
team/dlee/playback/main/stasis_channels.c
team/dlee/playback/res/Makefile
team/dlee/playback/res/res_stasis.c
team/dlee/playback/res/res_stasis_http.c
team/dlee/playback/res/stasis_http/resource_channels.c
Modified: team/dlee/playback/apps/app_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/apps/app_stasis.c?view=diff&rev=387618&r1=387617&r2=387618
==============================================================================
--- team/dlee/playback/apps/app_stasis.c (original)
+++ team/dlee/playback/apps/app_stasis.c Fri May 3 14:42:04 2013
@@ -35,7 +35,7 @@
#include "asterisk/app.h"
#include "asterisk/module.h"
#include "asterisk/stasis.h"
-#include "asterisk/stasis_app.h"
+#include "asterisk/stasis_app_impl.h"
/*** DOCUMENTATION
<application name="Stasis" language="en_US">
Modified: team/dlee/playback/include/asterisk/file.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/include/asterisk/file.h?view=diff&rev=387618&r1=387617&r2=387618
==============================================================================
--- team/dlee/playback/include/asterisk/file.h (original)
+++ team/dlee/playback/include/asterisk/file.h Fri May 3 14:42:04 2013
@@ -358,6 +358,45 @@
*/
struct ast_frame *ast_readframe(struct ast_filestream *s);
+/*! \brief Results of a sound or recording locate */
+enum ast_locate_result {
+ /*! Media was found. */
+ AST_LOCATE_FOUND,
+ /*! Media was not found. */
+ AST_LOCATE_NOT_FOUND,
+};
+
+/*!
+ * \brief Locate a sound file with a given name.
+ *
+ * The results of finding the file will be given by the return code. If the
+ * return is \c AST_LOCATE_FOUND, then \a file will be filled in with the
+ * file's location. \a file will be null terminated.
+ *
+ * \param[out] file Output param for the filename.
+ * \param filelen Max length of filelen.
+ * \param name Name of the sound to locate
+ * \param lang Optional name of the language to find.
+ * \return Results of the locate operation.
+ */
+enum ast_locate_result ast_locate_sound(char *file, size_t filelen,
+ const char *name, const char *lang);
+
+/*!
+ * \brief Locate a recording file with a given name.
+ *
+ * The results of finding the file will be given by the return code. If the
+ * return is \c AST_LOCATE_FOUND, then \a file will be filled in with the
+ * file's location. \a file will be null terminated.
+ *
+ * \param[out] file Output param for the filename.
+ * \param filelen Max length of filelen.
+ * \param name Name of the sound to locate
+ * \return Results of the locate operation.
+ */
+enum ast_locate_result ast_locate_recording(char *file, size_t filelen,
+ const char *name);
+
/*! Initialize file stuff */
/*!
* Initializes all the various file stuff. Basically just registers the cli stuff
Modified: team/dlee/playback/include/asterisk/module.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/include/asterisk/module.h?view=diff&rev=387618&r1=387617&r2=387618
==============================================================================
--- team/dlee/playback/include/asterisk/module.h (original)
+++ team/dlee/playback/include/asterisk/module.h Fri May 3 14:42:04 2013
@@ -478,6 +478,9 @@
*/
int ast_unregister_application(const char *app);
+/*! Macro to safely ref and unref the self module for the current scope */
+#define SCOPED_MODULE_USE(module) \
+ RAII_VAR(struct ast_module *, __self__ ## __LINE__, ast_module_ref(module), ast_module_unref)
#if defined(__cplusplus) || defined(c_plusplus)
}
Modified: team/dlee/playback/include/asterisk/stasis_app.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/include/asterisk/stasis_app.h?view=diff&rev=387618&r1=387617&r2=387618
==============================================================================
--- team/dlee/playback/include/asterisk/stasis_app.h (original)
+++ team/dlee/playback/include/asterisk/stasis_app.h Fri May 3 14:42:04 2013
@@ -49,27 +49,6 @@
#include "asterisk/channel.h"
#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[]);
-
-/*! @} */
-
/*! @{ */
/*!
@@ -83,7 +62,7 @@
* \param message Message to handle. (borrowed copy)
*/
typedef void (*stasis_app_cb)(void *data, const char *app_name,
- struct ast_json *message);
+ struct ast_json *message);
/*!
* \brief Register a new Stasis application.
@@ -144,6 +123,16 @@
const char *channel_id);
/*!
+ * \brief Returns the uniqueid of the channel associated with this control
+ *
+ * \param control Control object.
+ * \return Uniqueid of the associate channel.
+ * \return \c NULL if \a control is \c NULL.
+ */
+const char *stasis_app_control_get_channel_id(
+ const struct stasis_app_control *control);
+
+/*!
* \brief Exit \c res_stasis and continue execution in the dialplan.
*
* If the channel is no longer in \c res_stasis, this function does nothing.
@@ -156,20 +145,18 @@
* \brief Answer the channel associated with this control.
* \param control Control for \c res_stasis.
* \return 0 for success.
- * \return -1 for error.
+ * \return Non-zero for error.
*/
int stasis_app_control_answer(struct stasis_app_control *control);
-/*! @} */
-
-/*! @{ */
-
/*!
- * \brief Build a JSON object from a \ref ast_channel_snapshot.
- * \return JSON object representing channel snapshot.
- * \return \c NULL on error
+ * \brief Returns the most recent snapshot for the associated channel.
+ * \param control Control for \c res_stasis.
+ * \return Most recent snapshot. ao2_cleanup() when done.
+ * \return \c NULL if channel isn't in cache.
*/
-struct ast_json *ast_channel_snapshot_to_json(const struct ast_channel_snapshot *snapshot);
+struct ast_channel_snapshot *stasis_app_control_get_snapshot(
+ const struct stasis_app_control *control);
/*! @} */
Added: team/dlee/playback/include/asterisk/stasis_app_impl.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/include/asterisk/stasis_app_impl.h?view=auto&rev=387618
==============================================================================
--- team/dlee/playback/include/asterisk/stasis_app_impl.h (added)
+++ team/dlee/playback/include/asterisk/stasis_app_impl.h Fri May 3 14:42:04 2013
@@ -1,0 +1,88 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2012 - 2013, Digium, Inc.
+ *
+ * David M. Lee, II <dlee at digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#ifndef _ASTERISK_RES_STASIS_H
+#define _ASTERISK_RES_STASIS_H
+
+/*! \file
+ *
+ * \brief Backend API for implementing components of res_stasis.
+ *
+ * \author David M. Lee, II <dlee at digium.com>
+ * \since 12
+ *
+ * This file defines functions useful for defining new commands to execute
+ * on channels while they are in Stasis.
+ */
+
+#include "asterisk/stasis_app.h"
+
+/*!
+ * \since 12
+ * \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[]);
+
+/*! Callback type for stasis app commands */
+typedef void *(*stasis_app_command_cb)(struct stasis_app_control *control,
+ struct ast_channel *chan, void *data);
+
+/*!
+ * \since 12
+ * \brief Invokes a \a command on a \a control's channel.
+ *
+ * This function dispatches the command to be executed in the context of
+ * stasis_app_exec(), so this command will block waiting for the results of
+ * the command.
+ *
+ * \param control Control object for the channel to send the command to.
+ * \param command Command function to execute.
+ * \param data Optional data to pass along with the control function.
+ * \return Return value from \a command.
+ * \return \c NULL on error.
+ */
+void *stasis_app_send_command(struct stasis_app_control *control,
+ stasis_app_command_cb command, void *data);
+
+/*!
+ * \since 12
+ * \brief Asynchronous version of stasis_app_send().
+ *
+ * This function enqueues a command for execution, but returns immediately
+ * without waiting for the response.
+ *
+ * \param control Control object for the channel to send the command to.
+ * \param command Command function to execute.
+ * \param data Optional data to pass along with the control function.
+ * \return 0 on success.
+ * \return Non-zero on error.
+ */
+int stasis_app_send_command_async(struct stasis_app_control *control,
+ stasis_app_command_cb command, void *data);
+
+#endif /* _ASTERISK_RES_STASIS_H */
Propchange: team/dlee/playback/include/asterisk/stasis_app_impl.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/dlee/playback/include/asterisk/stasis_app_impl.h
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/dlee/playback/include/asterisk/stasis_app_impl.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: team/dlee/playback/include/asterisk/stasis_app_playback.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/include/asterisk/stasis_app_playback.h?view=auto&rev=387618
==============================================================================
--- team/dlee/playback/include/asterisk/stasis_app_playback.h (added)
+++ team/dlee/playback/include/asterisk/stasis_app_playback.h Fri May 3 14:42:04 2013
@@ -1,0 +1,73 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2013, Digium, Inc.
+ *
+ * David M. Lee, II <dlee at digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+#ifndef _ASTERISK_STASIS_APP_PLAYBACK_H
+#define _ASTERISK_STASIS_APP_PLAYBACK_H
+
+/*! \file
+ *
+ * \brief Stasis Application Playback API. See \ref res_stasis "Stasis
+ * Application API" for detailed documentation.
+ *
+ * \author David M. Lee, II <dlee at digium.com>
+ * \since 12
+ */
+
+#include "asterisk/stasis_app.h"
+
+/*! Opaque struct for handling the playback of a single file */
+struct stasis_app_playback;
+
+/*! State of a playback operation */
+enum stasis_app_playback_state {
+ /*! The playback has not started yet */
+ STASIS_PLAYBACK_QUEUED,
+ /*! The media is currently playing */
+ STASIS_PLAYBACK_PLAYING,
+ /*! The media has stopped playing */
+ STASIS_PLAYBACK_COMPLETE,
+};
+
+/*!
+ * \brief Play a file to the control's channel.
+ *
+ * Note that the file isn't the full path to the file. Asterisk's internal
+ * playback mechanism will automagically select the best format based on the
+ * available codecs for the channel.
+ *
+ * \param control Control for \c res_stasis.
+ * \param file Base filename for the file to play.
+ * \return Playback control object.
+ * \return \c NULL on error.
+ */
+struct stasis_app_playback *stasis_app_control_play_file(
+ struct stasis_app_control *control, const char *file);
+
+enum stasis_app_playback_state stasis_app_playback_get_state(
+ struct stasis_app_playback *control);
+const char *stasis_app_playback_get_id(
+ struct stasis_app_playback *control);
+struct stasis_app_playback *stasis_app_playback_find_by_id(const char *id);
+int stasis_app_playback_stop(struct stasis_app_playback *control);
+int stasis_app_playback_pause(struct stasis_app_playback *control);
+int stasis_app_playback_rewind(struct stasis_app_playback *control);
+int stasis_app_playback_fast_forward(struct stasis_app_playback *control);
+int stasis_app_playback_speed_up(struct stasis_app_playback *control);
+int stasis_app_playback_slow_down(struct stasis_app_playback *control);
+
+#endif /* _ASTERISK_STASIS_APP_PLAYBACK_H */
Propchange: team/dlee/playback/include/asterisk/stasis_app_playback.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/dlee/playback/include/asterisk/stasis_app_playback.h
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/dlee/playback/include/asterisk/stasis_app_playback.h
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: team/dlee/playback/include/asterisk/stasis_channels.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/include/asterisk/stasis_channels.h?view=diff&rev=387618&r1=387617&r2=387618
==============================================================================
--- team/dlee/playback/include/asterisk/stasis_channels.h (original)
+++ team/dlee/playback/include/asterisk/stasis_channels.h Fri May 3 14:42:04 2013
@@ -54,6 +54,7 @@
AST_STRING_FIELD(caller_number); /*!< Caller ID Number */
AST_STRING_FIELD(connected_name); /*!< Connected Line Name */
AST_STRING_FIELD(connected_number); /*!< Connected Line Number */
+ AST_STRING_FIELD(language); /*!< The default spoken language for the channel */
);
struct timeval creationtime; /*!< The time of channel creation */
@@ -255,6 +256,14 @@
/*!
* \since 12
+ * \brief Publish a \ref ast_channel_snapshot for a channel.
+ *
+ * \param chan Channel to publish.
+ */
+void ast_channel_publish_snapshot(struct ast_channel *chan);
+
+/*!
+ * \since 12
* \brief Publish a \ref ast_channel_varset for a channel.
*
* \param chan Channel to pulish the event for, or \c NULL for 'none'.
Modified: team/dlee/playback/include/asterisk/stasis_http.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/include/asterisk/stasis_http.h?view=diff&rev=387618&r1=387617&r2=387618
==============================================================================
--- team/dlee/playback/include/asterisk/stasis_http.h (original)
+++ team/dlee/playback/include/asterisk/stasis_http.h Fri May 3 14:42:04 2013
@@ -163,6 +163,12 @@
void stasis_http_response_no_content(struct stasis_http_response *response);
/*!
+ * \brief Fill in a <tt>Created</tt> (201) \a stasis_http_response.
+ */
+void stasis_http_response_created(struct stasis_http_response *response,
+ const char *url);
+
+/*!
* \brief Fill in \a response with a 500 message for allocation failures.
* \param response Response to fill in.
*/
Modified: team/dlee/playback/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/main/channel.c?view=diff&rev=387618&r1=387617&r2=387618
==============================================================================
--- team/dlee/playback/main/channel.c (original)
+++ team/dlee/playback/main/channel.c Fri May 3 14:42:04 2013
@@ -814,26 +814,6 @@
return causes[x].cause;
return -1;
-}
-
-static void publish_channel_state(struct ast_channel *chan)
-{
- RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
- RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);
-
- snapshot = ast_channel_snapshot_create(chan);
- if (!snapshot) {
- ast_log(LOG_ERROR, "Allocation error\n");
- return;
- }
-
- message = stasis_message_create(ast_channel_snapshot_type(), snapshot);
- if (!message) {
- return;
- }
-
- ast_assert(ast_channel_topic(chan) != NULL);
- stasis_publish(ast_channel_topic(chan), message);
}
static void publish_cache_clear(struct ast_channel *chan)
@@ -1176,7 +1156,7 @@
* a lot of data into this func to do it here!
*/
if (ast_get_channel_tech(tech) || (tech2 && ast_get_channel_tech(tech2))) {
- publish_channel_state(tmp);
+ ast_channel_publish_snapshot(tmp);
}
ast_channel_internal_finalize(tmp);
@@ -2888,7 +2868,7 @@
ast_cc_offer(chan);
- publish_channel_state(chan);
+ ast_channel_publish_snapshot(chan);
publish_cache_clear(chan);
if (ast_channel_cdr(chan) && !ast_test_flag(ast_channel_cdr(chan), AST_CDR_FLAG_BRIDGED) &&
@@ -7149,7 +7129,7 @@
ast_channel_redirecting_set(original, ast_channel_redirecting(clonechan));
ast_channel_redirecting_set(clonechan, &exchange.redirecting);
- publish_channel_state(original);
+ ast_channel_publish_snapshot(original);
/* Restore original timing file descriptor */
ast_channel_set_fd(original, AST_TIMING_FD, ast_channel_timingfd(original));
@@ -7315,7 +7295,7 @@
ast_cdr_setcid(ast_channel_cdr(chan), chan);
}
- publish_channel_state(chan);
+ ast_channel_publish_snapshot(chan);
ast_channel_unlock(chan);
}
@@ -7341,7 +7321,7 @@
ast_channel_lock(chan);
ast_party_caller_set(ast_channel_caller(chan), caller, update);
- publish_channel_state(chan);
+ ast_channel_publish_snapshot(chan);
if (ast_channel_cdr(chan)) {
ast_cdr_setcid(ast_channel_cdr(chan), chan);
}
@@ -7368,7 +7348,7 @@
* we override what they are saying the state is and things go amuck. */
ast_devstate_changed_literal(AST_DEVICE_UNKNOWN, (ast_test_flag(ast_channel_flags(chan), AST_FLAG_DISABLE_DEVSTATE_CACHE) ? AST_DEVSTATE_NOT_CACHABLE : AST_DEVSTATE_CACHABLE), name);
- publish_channel_state(chan);
+ ast_channel_publish_snapshot(chan);
return 0;
}
Modified: team/dlee/playback/main/channel_internal_api.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/main/channel_internal_api.c?view=diff&rev=387618&r1=387617&r2=387618
==============================================================================
--- team/dlee/playback/main/channel_internal_api.c (original)
+++ team/dlee/playback/main/channel_internal_api.c Fri May 3 14:42:04 2013
@@ -409,15 +409,17 @@
/* ACCESSORS */
-#define DEFINE_STRINGFIELD_SETTERS_FOR(field) \
+#define DEFINE_STRINGFIELD_SETTERS_FOR(field, publish) \
void ast_channel_##field##_set(struct ast_channel *chan, const char *value) \
{ \
ast_string_field_set(chan, field, value); \
+ if (publish) ast_channel_publish_snapshot(chan); \
} \
\
void ast_channel_##field##_build_va(struct ast_channel *chan, const char *fmt, va_list ap) \
{ \
ast_string_field_build_va(chan, field, fmt, ap); \
+ if (publish) ast_channel_publish_snapshot(chan); \
} \
void ast_channel_##field##_build(struct ast_channel *chan, const char *fmt, ...) \
{ \
@@ -425,19 +427,20 @@
va_start(ap, fmt); \
ast_channel_##field##_build_va(chan, fmt, ap); \
va_end(ap); \
-}
-
-DEFINE_STRINGFIELD_SETTERS_FOR(name);
-DEFINE_STRINGFIELD_SETTERS_FOR(language);
-DEFINE_STRINGFIELD_SETTERS_FOR(musicclass);
-DEFINE_STRINGFIELD_SETTERS_FOR(accountcode);
-DEFINE_STRINGFIELD_SETTERS_FOR(peeraccount);
-DEFINE_STRINGFIELD_SETTERS_FOR(userfield);
-DEFINE_STRINGFIELD_SETTERS_FOR(call_forward);
-DEFINE_STRINGFIELD_SETTERS_FOR(uniqueid);
-DEFINE_STRINGFIELD_SETTERS_FOR(parkinglot);
-DEFINE_STRINGFIELD_SETTERS_FOR(hangupsource);
-DEFINE_STRINGFIELD_SETTERS_FOR(dialcontext);
+ if (publish) ast_channel_publish_snapshot(chan); \
+}
+
+DEFINE_STRINGFIELD_SETTERS_FOR(name, 0);
+DEFINE_STRINGFIELD_SETTERS_FOR(language, 1);
+DEFINE_STRINGFIELD_SETTERS_FOR(musicclass, 0);
+DEFINE_STRINGFIELD_SETTERS_FOR(accountcode, 0);
+DEFINE_STRINGFIELD_SETTERS_FOR(peeraccount, 0);
+DEFINE_STRINGFIELD_SETTERS_FOR(userfield, 0);
+DEFINE_STRINGFIELD_SETTERS_FOR(call_forward, 0);
+DEFINE_STRINGFIELD_SETTERS_FOR(uniqueid, 0);
+DEFINE_STRINGFIELD_SETTERS_FOR(parkinglot, 0);
+DEFINE_STRINGFIELD_SETTERS_FOR(hangupsource, 0);
+DEFINE_STRINGFIELD_SETTERS_FOR(dialcontext, 0);
#define DEFINE_STRINGFIELD_GETTER_FOR(field) const char *ast_channel_##field(const struct ast_channel *chan) \
{ \
Modified: team/dlee/playback/main/file.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/main/file.c?view=diff&rev=387618&r1=387617&r2=387618
==============================================================================
--- team/dlee/playback/main/file.c (original)
+++ team/dlee/playback/main/file.c Fri May 3 14:42:04 2013
@@ -1672,6 +1672,31 @@
#undef FORMAT2
}
+enum ast_locate_result ast_locate_sound(char *file, size_t filelen,
+ const char *name, const char *lang)
+{
+ /* Some variables aren't necessary, but it's better than a function
+ * call with a bunch of NULL's as parameters. */
+ const char *format = NULL;
+ struct ast_format_cap *result_cap = NULL;
+ int res;
+
+ res = fileexists_core(name, format, lang, file, filelen, result_cap);
+
+ if (!res) {
+ return AST_LOCATE_NOT_FOUND;
+ }
+
+ return AST_LOCATE_FOUND;
+}
+
+enum ast_locate_result ast_locate_recording(char *file, size_t filelen,
+ const char *name)
+{
+ ast_assert(0); /* TODO */
+ return AST_LOCATE_NOT_FOUND;
+}
+
static struct ast_cli_entry cli_file[] = {
AST_CLI_DEFINE(handle_cli_core_show_file_formats, "Displays file formats")
};
Modified: team/dlee/playback/main/stasis_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/main/stasis_channels.c?view=diff&rev=387618&r1=387617&r2=387618
==============================================================================
--- team/dlee/playback/main/stasis_channels.c (original)
+++ team/dlee/playback/main/stasis_channels.c Fri May 3 14:42:04 2013
@@ -146,6 +146,7 @@
S_COR(ast_channel_connected(chan)->id.name.valid, ast_channel_connected(chan)->id.name.str, ""));
ast_string_field_set(snapshot, connected_number,
S_COR(ast_channel_connected(chan)->id.number.valid, ast_channel_connected(chan)->id.number.str, ""));
+ ast_string_field_set(snapshot, language, ast_channel_language(chan));
snapshot->creationtime = ast_channel_creationtime(chan);
snapshot->state = ast_channel_state(chan);
@@ -431,6 +432,27 @@
return ast_json_string_get(ast_json_object_get(obj->blob, "type"));
}
+
+void ast_channel_publish_snapshot(struct ast_channel *chan)
+{
+ RAII_VAR(struct ast_channel_snapshot *, snapshot, NULL, ao2_cleanup);
+ RAII_VAR(struct stasis_message *, message, NULL, ao2_cleanup);
+
+ snapshot = ast_channel_snapshot_create(chan);
+ if (!snapshot) {
+ ast_log(LOG_ERROR, "Allocation error\n");
+ return;
+ }
+
+ message = stasis_message_create(ast_channel_snapshot_type(), snapshot);
+ if (!message) {
+ return;
+ }
+
+ ast_assert(ast_channel_topic(chan) != NULL);
+ stasis_publish(ast_channel_topic(chan), message);
+}
+
void ast_channel_publish_varset(struct ast_channel *chan, const char *name, const char *value)
{
Modified: team/dlee/playback/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/res/Makefile?view=diff&rev=387618&r1=387617&r2=387618
==============================================================================
--- team/dlee/playback/res/Makefile (original)
+++ team/dlee/playback/res/Makefile Fri May 3 14:42:04 2013
@@ -46,6 +46,9 @@
$(if $(filter res_sip,$(EMBEDDED_MODS)),modules.link,res_sip.so): $(subst .c,.o,$(wildcard res_sip/*.c))
$(subst .c,.o,$(wildcard res_sip/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_sip)
+$(if $(filter res_stasis,$(EMBEDDED_MODS)),modules.link,res_stasis.so): $(subst .c,.o,$(wildcard stasis/*.c))
+$(subst .c,.o,$(wildcard stasis/*.c)): _ASTCFLAGS+=$(call MOD_ASTCFLAGS,res_stasis)
+
ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
ael/ael_lex.c: ael/ael.flex
else
@@ -70,7 +73,8 @@
ael/pval.o: ael/pval.c
clean::
- rm -f snmp/*.[oi] ael/*.[oi] ais/*.[oi] stasis_http/*.[oi] res_sip/*.[oi]
+ rm -f snmp/*.[oi] ael/*.[oi] ais/*.[oi] stasis_http/*.[oi]
+ rm -f res_sip/*.[oi] stasis/*.[oi]
# Dependencies for res_stasis_http_*.so are generated, so they're in this file
include stasis_http.make
Modified: team/dlee/playback/res/res_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/playback/res/res_stasis.c?view=diff&rev=387618&r1=387617&r2=387618
==============================================================================
--- team/dlee/playback/res/res_stasis.c (original)
+++ team/dlee/playback/res/res_stasis.c Fri May 3 14:42:04 2013
@@ -21,6 +21,30 @@
* \brief Stasis application support.
*
* \author David M. Lee, II <dlee at digium.com>
+ *
+ * <code>res_stasis.so</code> brings together the various components of the
+ * Stasis application infrastructure.
+ *
+ * First, there's the Stasis application handler, stasis_app_exec(). This is
+ * called by <code>app_stasis.so</code> to give control of a channel to the
+ * Stasis application code from the dialplan.
+ *
+ * While a channel is in stasis_app_exec(), it has a \ref stasis_app_control
+ * object, which may be used to control the channel.
+ *
+ * To control the channel, commands may be sent to channel using
+ * stasis_app_send_command() and stasis_app_send_async_command().
+ *
+ * Alongside this, applications may be registered/unregistered using
+ * stasis_app_register()/stasis_app_unregister(). While a channel is in Stasis,
+ * events received on the channel's topic are converted to JSON and forwarded to
+ * the \ref stasis_app_cb. The application may also subscribe to the channel to
+ * continue to receive messages even after the channel has left Stasis, but it
+ * will not be able to control it.
+ *
+ * Given all the stuff that comes together in this module, it's been broken up
+ * into several pieces that are in <code>res/stasis/</code> and compiled into
+ * <code>res_stasis.so</code>.
*/
/*** MODULEINFO
@@ -32,13 +56,13 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/astobj2.h"
-#include "asterisk/channel.h"
-#include "asterisk/lock.h"
#include "asterisk/module.h"
-#include "asterisk/stasis.h"
-#include "asterisk/stasis_app.h"
+#include "asterisk/stasis_app_impl.h"
#include "asterisk/stasis_channels.h"
#include "asterisk/strings.h"
+
+#include "stasis/app.h"
+#include "stasis/control.h"
/*! Time to wait for a frame in the application */
#define MAX_WAIT_MS 200
@@ -55,217 +79,54 @@
*/
#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)
-{
- 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) {
+struct ao2_container *apps_registry;
+
+struct ao2_container *app_controls;
+
+/*! AO2 hash function for \ref stasis_app_control */
+static int control_hash(const void *obj, const int flags)
+{
+ const struct stasis_app_control *control = obj;
+ const char *id = flags & OBJ_KEY ?
+ obj : stasis_app_control_get_channel_id(control);
+
+ return ast_str_hash(id);
+}
+
+/*! AO2 comparison function for \ref stasis_app_control */
+static int control_compare(void *lhs, void *rhs, int flags)
+{
+ const struct stasis_app_control *lhs_control = lhs;
+ const struct stasis_app_control *rhs_control = rhs;
+ const char *lhs_id = stasis_app_control_get_channel_id(lhs_control);
+ const char *rhs_id = flags & OBJ_KEY ?
+ rhs : stasis_app_control_get_channel_id(rhs_control);
+
+ if (strcmp(lhs_id, rhs_id) == 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);
-}
-
-typedef void* (*stasis_app_command_cb)(struct stasis_app_control *control,
- struct ast_channel *chan,
- void *data);
-
-struct stasis_app_command {
- ast_mutex_t lock;
- ast_cond_t condition;
- stasis_app_command_cb callback;
- void *data;
- void *retval;
- int is_done:1;
-};
-
-static void command_dtor(void *obj)
-{
- struct stasis_app_command *command = obj;
- ast_mutex_destroy(&command->lock);
- ast_cond_destroy(&command->condition);
-}
-
-static struct stasis_app_command *command_create(stasis_app_command_cb callback,
- void *data)
-{
- RAII_VAR(struct stasis_app_command *, command, NULL, ao2_cleanup);
-
- command = ao2_alloc(sizeof(*command), command_dtor);
- if (!command) {
- return NULL;
- }
-
- ast_mutex_init(&command->lock);
- ast_cond_init(&command->condition, 0);
- command->callback = callback;
- command->data = data;
-
- ao2_ref(command, +1);
- return command;
-}
-
-static void command_complete(struct stasis_app_command *command, void *retval)
-{
- SCOPED_MUTEX(lock, &command->lock);
-
- command->is_done = 1;
- command->retval = retval;
- ast_cond_signal(&command->condition);
-}
-
-static void *wait_for_command(struct stasis_app_command *command)
-{
- SCOPED_MUTEX(lock, &command->lock);
- while (!command->is_done) {
- ast_cond_wait(&command->condition, &command->lock);
- }
-
- return command->retval;
-}
-
-struct stasis_app_control {
- /*! Queue of commands to dispatch on the channel */
- struct ao2_container *command_queue;
- /*!
- * When set, /c app_stasis should exit and continue in the dialplan.
- */
- int continue_to_dialplan:1;
- /*! Uniqueid of the associated channel */
- char channel_id[];
-};
-
-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;
- }
-
- control->command_queue = ao2_container_alloc_list(0, 0, NULL, NULL);
-
- strncpy(control->channel_id, uniqueid, size - sizeof(*control));
-
- return control;
-}
-
-static void *exec_command(struct stasis_app_control *control,
- struct stasis_app_command *command)
-{
- ao2_lock(control);
- ao2_ref(command, +1);
- ao2_link(control->command_queue, command);
- ao2_unlock(control);
-
- return wait_for_command(command);
-}
-
-/*! AO2 hash function for \ref stasis_app_control */
-static int control_hash(const void *obj, const int flags)
-{
- const struct stasis_app_control *control = obj;
- const char *id = flags & OBJ_KEY ? obj : control->channel_id;
-
- return ast_str_hash(id);
-}
-
-/*! AO2 comparison function for \ref stasis_app_control */
-static int control_compare(void *lhs, void *rhs, int flags)
-{
- const struct stasis_app_control *lhs_control = lhs;
- const struct stasis_app_control *rhs_control = rhs;
- const char *rhs_name =
- flags & OBJ_KEY ? rhs : rhs_control->channel_id;
-
- if (strcmp(lhs_control->channel_id, rhs_name) == 0) {
+/*! 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(app);
+
+ 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 *lhs_name = app_name(lhs_app);
+ const char *rhs_name = flags & OBJ_KEY ? rhs : app_name(rhs_app);
+
+ if (strcmp(lhs_name, rhs_name) == 0) {
return CMP_MATCH | CMP_STOP;
} else {
return 0;
@@ -286,220 +147,29 @@
struct stasis_app_control *stasis_app_control_find_by_channel_id(
const char *channel_id)
{
- RAII_VAR(struct ao2_container *, controls, NULL, ao2_cleanup);
- controls = app_controls();
- return ao2_find(controls, channel_id, 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 int OK = 0;
-static int FAIL = -1;
-
-static void *__app_control_answer(struct stasis_app_control *control,
- struct ast_channel *chan, void *data)
-{
- ast_debug(3, "%s: Answering", control->channel_id);
- return __ast_answer(chan, 0, 1) == 0 ? &OK : &FAIL;
-}
-
-int stasis_app_control_answer(struct stasis_app_control *control)
-{
- RAII_VAR(struct stasis_app_command *, command, NULL, ao2_cleanup);
- int *retval;
-
- ast_debug(3, "%s: Sending answer command\n", control->channel_id);
-
- command = command_create(__app_control_answer, NULL);
- retval = exec_command(control, command);
-
- if (*retval != 0) {
- ast_log(LOG_WARNING, "Failed to answer channel");
- }
-
- return *retval;
-}
-
-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));
-
+ return ao2_find(app_controls, channel_id, OBJ_KEY);
+}
+
+struct ast_channel_snapshot *stasis_app_control_get_snapshot(
+ const struct stasis_app_control *control)
+{
+ RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup);
+ struct stasis_caching_topic *caching_topic;
+ struct ast_channel_snapshot *snapshot;
+
+ caching_topic = ast_channel_topic_all_cached();
+ ast_assert(caching_topic != NULL);
+
+ msg = stasis_cache_get(caching_topic, ast_channel_snapshot_type(),
+ stasis_app_control_get_channel_id(control));
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 dtmf_handler(struct app *app, struct ast_channel_blob *obj)
-{
- RAII_VAR(struct ast_json *, extra, NULL, ast_json_unref);
- RAII_VAR(struct ast_json *, msg, NULL, ast_json_unref);
- const char *direction;
-
- /* To simplify events, we'll only generate on receive */
- direction = ast_json_string_get(
- ast_json_object_get(obj->blob, "direction"));
-
- if (strcmp("Received", direction) != 0) {
- return;
- }
-
- extra = ast_json_pack(
- "{s: o}",
- "digit", ast_json_ref(ast_json_object_get(obj->blob, "digit")));
- if (!extra) {
- return;
[... 1574 lines stripped ...]
More information about the asterisk-commits
mailing list