diff options
| author | Kevin Harwell <kharwell@digium.com> | 2014-12-09 20:20:27 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2014-12-09 20:20:27 +0000 |
| commit | d673209abcd1a80e3c79153fd639bd84d21045e5 (patch) | |
| tree | a294e1f3b5bb278600bf2f7b2365b4ea1a32075a /res/ari | |
| parent | c17cef1c383e34128cb8e3b3bdd573bad72caf75 (diff) | |
ARI/AMI: Include language in standard channel snapshot output
The channel "language" was already part of a channel snapshot, however is was
not sent out over AMI or ARI. This patch makes it so the channel "language" is
included in the appropriate AMI or ARI events.
ASTERISK-24553 #close
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/4245/
........
Merged revisions 429204 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 429206 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/ari')
| -rw-r--r-- | res/ari/ari_model_validators.c | 16 | ||||
| -rw-r--r-- | res/ari/ari_model_validators.h | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/res/ari/ari_model_validators.c b/res/ari/ari_model_validators.c index 9b5671a76..491a4cca1 100644 --- a/res/ari/ari_model_validators.c +++ b/res/ari/ari_model_validators.c @@ -786,6 +786,7 @@ int ast_ari_validate_channel(struct ast_json *json) int has_creationtime = 0; int has_dialplan = 0; int has_id = 0; + int has_language = 0; int has_name = 0; int has_state = 0; @@ -850,6 +851,16 @@ int ast_ari_validate_channel(struct ast_json *json) res = 0; } } else + if (strcmp("language", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + has_language = 1; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI Channel field language failed validation\n"); + res = 0; + } + } else if (strcmp("name", ast_json_object_iter_key(iter)) == 0) { int prop_is_valid; has_name = 1; @@ -908,6 +919,11 @@ int ast_ari_validate_channel(struct ast_json *json) res = 0; } + if (!has_language) { + ast_log(LOG_ERROR, "ARI Channel missing required field language\n"); + res = 0; + } + if (!has_name) { ast_log(LOG_ERROR, "ARI Channel missing required field name\n"); res = 0; diff --git a/res/ari/ari_model_validators.h b/res/ari/ari_model_validators.h index de8547cb1..947e28852 100644 --- a/res/ari/ari_model_validators.h +++ b/res/ari/ari_model_validators.h @@ -1242,6 +1242,7 @@ ari_validator ast_ari_validate_application_fn(void); * - creationtime: Date (required) * - dialplan: DialplanCEP (required) * - id: string (required) + * - language: string (required) * - name: string (required) * - state: string (required) * Dialed |