kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 12:54:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve a merge conflict

Browse Source 
When ast_channel_cached_blob_create was merged,
ast_channel_blob_create_from_cache was partially removed in an
unresolved merge conflict. This restores ast_channel_blob_create_from_cache
and refactors usage of ast_channel_cached_blob_create (requires an
ast_channel) to use ast_channel_blob_create_from_cache (requires a
channel uniqueid) instead.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389974 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2013-05-29 02:26:17 +00:00
parent bb584c55de
commit 6851801a5e
6 changed files with 10 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_fax.c
View File

@@ -268,7 +268,7 @@ static void phase_e_handler(t30_state_t *f, void *user_data, int result)
"fax_resolution", stat.y_resolution, "fax_resolution", stat.y_resolution,
"fax_bitrate", stat.bit_rate, "fax_bitrate", stat.bit_rate,
"filenames", json_filenames); "filenames", json_filenames);
message = ast_channel_cached_blob_create(s->chan, ast_channel_fax_type(), json_object); message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(s->chan), ast_channel_fax_type(), json_object);
if (!message) { if (!message) {
return; return;
} }

21
include/asterisk/stasis_channels.h
View File

@@ -153,27 +153,6 @@ struct ast_channel_snapshot *ast_channel_snapshot_get_latest(const char *uniquei
struct stasis_message *ast_channel_blob_create(struct ast_channel *chan, struct stasis_message *ast_channel_blob_create(struct ast_channel *chan,
struct stasis_message_type *type, struct ast_json *blob); struct stasis_message_type *type, struct ast_json *blob);
/*!
* \since 12
* \brief Creates a \ref ast_channel_blob message using the current cached
* \ref ast_channel_snapshot for the passed in \ref ast_channel
*
* The given \a blob should be treated as immutable and not modified after it is
* put into the message.
*
* \param chan Channel blob is associated with, or \c NULL for global/all channels.
* \param type Message type for this blob.
* \param blob JSON object representing the data, or \c NULL for no data. If
* \c NULL, ast_json_null() is put into the object.
*
* \param chan Channel blob is associated with
* \param blob JSON object representing the data.
* \return \ref ast_channel_blob message.
* \return \c NULL on error
*/
struct stasis_message *ast_channel_cached_blob_create(struct ast_channel *chan,
struct stasis_message_type *type, struct ast_json *blob);
/*! /*!
* \since 12 * \since 12
* \brief Create a \ref ast_channel_blob message, pulling channel state from * \brief Create a \ref ast_channel_blob message, pulling channel state from

4
main/stasis_channels.c
View File

@@ -250,12 +250,12 @@ static struct stasis_message *create_channel_blob_message(struct ast_channel_sna
return msg; return msg;
} }
struct stasis_message *ast_channel_cached_blob_create(struct ast_channel *chan, struct stasis_message *ast_channel_blob_create_from_cache(const char *channel_id,
struct stasis_message_type *type, struct stasis_message_type *type,
struct ast_json *blob) struct ast_json *blob)
{ {
RAII_VAR(struct ast_channel_snapshot *, snapshot, RAII_VAR(struct ast_channel_snapshot *, snapshot,
ast_channel_snapshot_get_latest(ast_channel_uniqueid(chan)), ast_channel_snapshot_get_latest(channel_id),
ao2_cleanup); ao2_cleanup);
return create_channel_blob_message(snapshot, type, blob); return create_channel_blob_message(snapshot, type, blob);

6
res/res_fax.c
View File

@@ -1197,7 +1197,7 @@ static int report_fax_status(struct ast_channel *chan, struct ast_fax_session_de
{ {
SCOPED_CHANNELLOCK(lock, chan); SCOPED_CHANNELLOCK(lock, chan);
message = ast_channel_cached_blob_create(chan, ast_channel_fax_type(), json_object); message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_fax_type(), json_object);
if (!message) { if (!message) {
return -1; return -1;
} }
@@ -1789,7 +1789,7 @@ static int report_receive_fax_status(struct ast_channel *chan, const char *filen
return -1; return -1;
} }
message = ast_channel_cached_blob_create(chan, ast_channel_fax_type(), json_object); message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_fax_type(), json_object);
if (!message) { if (!message) {
return -1; return -1;
} }
@@ -2269,7 +2269,7 @@ static int report_send_fax_status(struct ast_channel *chan, struct ast_fax_sessi
return -1; return -1;
} }
message = ast_channel_cached_blob_create(chan, ast_channel_fax_type(), json_obj); message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_fax_type(), json_obj);
if (!message) { if (!message) {
return -1; return -1;
} }

4
res/res_monitor.c
View File

@@ -396,7 +396,7 @@ int AST_OPTIONAL_API_NAME(ast_monitor_start)(struct ast_channel *chan, const cha
/* so we know this call has been monitored in case we need to bill for it or something */ /* so we know this call has been monitored in case we need to bill for it or something */
pbx_builtin_setvar_helper(chan, "__MONITORED","true"); pbx_builtin_setvar_helper(chan, "__MONITORED","true");
message = ast_channel_cached_blob_create(chan, message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan),
ast_channel_monitor_start_type(), ast_channel_monitor_start_type(),
NULL); NULL);
if (message) { if (message) {
@@ -516,7 +516,7 @@ int AST_OPTIONAL_API_NAME(ast_monitor_stop)(struct ast_channel *chan, int need_l
ast_free(ast_channel_monitor(chan)); ast_free(ast_channel_monitor(chan));
ast_channel_monitor_set(chan, NULL); ast_channel_monitor_set(chan, NULL);
message = ast_channel_cached_blob_create(chan, message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan),
ast_channel_monitor_stop_type(), ast_channel_monitor_stop_type(),
NULL); NULL);
if (message) { if (message) {

4
res/res_musiconhold.c
View File

@@ -1585,7 +1585,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
return -1; return -1;
} }
message = ast_channel_cached_blob_create(chan, message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan),
ast_channel_moh_start_type(), ast_channel_moh_start_type(),
json_object); json_object);
if (message) { if (message) {
@@ -1611,7 +1611,7 @@ static void local_ast_moh_stop(struct ast_channel *chan)
} }
} }
message = ast_channel_cached_blob_create(chan, ast_channel_moh_stop_type(), NULL); message = ast_channel_blob_create_from_cache(ast_channel_uniqueid(chan), ast_channel_moh_stop_type(), NULL);
if (message) { if (message) {
stasis_publish(ast_channel_topic(chan), message); stasis_publish(ast_channel_topic(chan), message);
} }