kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_stasis_recording: Add a "target_uri" field to recording events.

Browse Source 
This change adds a target_uri field to the live recording object. It
contains the URI of what is being recorded.

(closes issue ASTERISK-23258)
Reported by: Ben Merrills

Review: https://reviewboard.asterisk.org/r/3299/
........

Merged revisions 410025 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410027 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2014-03-06 18:20:37 +00:00
parent 59ff66ef02
commit 3f730662f7
8 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/ari/ari_model_validators.c
View File

@@ -1026,6 +1026,7 @@ int ast_ari_validate_live_recording(struct ast_json *json)
int has_format = 0;
int has_name = 0;
int has_state = 0;
int has_target_uri = 0;
for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) {
if (strcmp("cause", ast_json_object_iter_key(iter)) == 0) {
@@ -1067,6 +1068,16 @@ int ast_ari_validate_live_recording(struct ast_json *json)
res = 0;
}
} else
if (strcmp("target_uri", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_target_uri = 1;
prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI LiveRecording field target_uri failed validation\n");
res = 0;
}
} else
{
ast_log(LOG_ERROR,
"ARI LiveRecording has undocumented field %s\n",
@@ -1090,6 +1101,11 @@ int ast_ari_validate_live_recording(struct ast_json *json)
res = 0;
}
if (!has_target_uri) {
ast_log(LOG_ERROR, "ARI LiveRecording missing required field target_uri\n");
res = 0;
}
return res;
}