diff options
author | Mark Michelson <mmichelson@digium.com> | 2014-12-08 16:24:36 +0000 |
---|---|---|
committer | Mark Michelson <mmichelson@digium.com> | 2014-12-08 16:24:36 +0000 |
commit | fe7671fee69b0ce1a6120a9ccb6664c5f31d37d3 (patch) | |
tree | 108d125bf0ea17e17cfb63bf5d7d89756eb30f7e /res | |
parent | 4bb556a8478741dc81361327d3a50a8809be09f6 (diff) |
Add new AMI and ARI events for connected line changes on a channel.
The AMI event is called NewConnectedLine and the ARI event is called
ChannelConnectedLine.
ASTERISK-24554 #close
Reported by Matt Jordan
Review: https://reviewboard.asterisk.org/r/4231
........
Merged revisions 429064 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@429084 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r-- | res/ari/ari_model_validators.c | 85 | ||||
-rw-r--r-- | res/ari/ari_model_validators.h | 23 | ||||
-rw-r--r-- | res/stasis/app.c | 28 |
3 files changed, 136 insertions, 0 deletions
diff --git a/res/ari/ari_model_validators.c b/res/ari/ari_model_validators.c index 06c3cf7ee..9b5671a76 100644 --- a/res/ari/ari_model_validators.c +++ b/res/ari/ari_model_validators.c @@ -2505,6 +2505,85 @@ ari_validator ast_ari_validate_channel_caller_id_fn(void) return ast_ari_validate_channel_caller_id; } +int ast_ari_validate_channel_connected_line(struct ast_json *json) +{ + int res = 1; + struct ast_json_iter *iter; + int has_type = 0; + int has_application = 0; + int has_channel = 0; + + for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) { + if (strcmp("type", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + has_type = 1; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI ChannelConnectedLine field type failed validation\n"); + res = 0; + } + } else + if (strcmp("application", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + has_application = 1; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI ChannelConnectedLine field application failed validation\n"); + res = 0; + } + } else + if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + prop_is_valid = ast_ari_validate_date( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI ChannelConnectedLine field timestamp failed validation\n"); + res = 0; + } + } else + if (strcmp("channel", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + has_channel = 1; + prop_is_valid = ast_ari_validate_channel( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI ChannelConnectedLine field channel failed validation\n"); + res = 0; + } + } else + { + ast_log(LOG_ERROR, + "ARI ChannelConnectedLine has undocumented field %s\n", + ast_json_object_iter_key(iter)); + res = 0; + } + } + + if (!has_type) { + ast_log(LOG_ERROR, "ARI ChannelConnectedLine missing required field type\n"); + res = 0; + } + + if (!has_application) { + ast_log(LOG_ERROR, "ARI ChannelConnectedLine missing required field application\n"); + res = 0; + } + + if (!has_channel) { + ast_log(LOG_ERROR, "ARI ChannelConnectedLine missing required field channel\n"); + res = 0; + } + + return res; +} + +ari_validator ast_ari_validate_channel_connected_line_fn(void) +{ + return ast_ari_validate_channel_connected_line; +} + int ast_ari_validate_channel_created(struct ast_json *json) { int res = 1; @@ -4003,6 +4082,9 @@ int ast_ari_validate_event(struct ast_json *json) if (strcmp("ChannelCallerId", discriminator) == 0) { return ast_ari_validate_channel_caller_id(json); } else + if (strcmp("ChannelConnectedLine", discriminator) == 0) { + return ast_ari_validate_channel_connected_line(json); + } else if (strcmp("ChannelCreated", discriminator) == 0) { return ast_ari_validate_channel_created(json); } else @@ -4171,6 +4253,9 @@ int ast_ari_validate_message(struct ast_json *json) if (strcmp("ChannelCallerId", discriminator) == 0) { return ast_ari_validate_channel_caller_id(json); } else + if (strcmp("ChannelConnectedLine", discriminator) == 0) { + return ast_ari_validate_channel_connected_line(json); + } else if (strcmp("ChannelCreated", discriminator) == 0) { return ast_ari_validate_channel_created(json); } else diff --git a/res/ari/ari_model_validators.h b/res/ari/ari_model_validators.h index 3a0bdb94a..de8547cb1 100644 --- a/res/ari/ari_model_validators.h +++ b/res/ari/ari_model_validators.h @@ -681,6 +681,24 @@ int ast_ari_validate_channel_caller_id(struct ast_json *json); ari_validator ast_ari_validate_channel_caller_id_fn(void); /*! + * \brief Validator for ChannelConnectedLine. + * + * Channel changed Connected Line. + * + * \param json JSON object to validate. + * \returns True (non-zero) if valid. + * \returns False (zero) if invalid. + */ +int ast_ari_validate_channel_connected_line(struct ast_json *json); + +/*! + * \brief Function pointer to ast_ari_validate_channel_connected_line(). + * + * See \ref ast_ari_model_validators.h for more details. + */ +ari_validator ast_ari_validate_channel_connected_line_fn(void); + +/*! * \brief Validator for ChannelCreated. * * Notification that a channel has been created. @@ -1330,6 +1348,11 @@ ari_validator ast_ari_validate_application_fn(void); * - caller_presentation: int (required) * - caller_presentation_txt: string (required) * - channel: Channel (required) + * ChannelConnectedLine + * - type: string (required) + * - application: string (required) + * - timestamp: Date + * - channel: Channel (required) * ChannelCreated * - type: string (required) * - application: string (required) diff --git a/res/stasis/app.c b/res/stasis/app.c index 725414561..1cc4fb511 100644 --- a/res/stasis/app.c +++ b/res/stasis/app.c @@ -450,10 +450,38 @@ static struct ast_json *channel_callerid( "channel", json_channel); } +static struct ast_json *channel_connected_line( + struct ast_channel_snapshot *old_snapshot, + struct ast_channel_snapshot *new_snapshot, + const struct timeval *tv) +{ + struct ast_json *json_channel; + + /* No ChannelConnectedLine event on cache clear or first event */ + if (!old_snapshot || !new_snapshot) { + return NULL; + } + + if (ast_channel_snapshot_connected_line_equal(old_snapshot, new_snapshot)) { + return NULL; + } + + json_channel = ast_channel_snapshot_to_json(new_snapshot, stasis_app_get_sanitizer()); + if (!json_channel) { + return NULL; + } + + return ast_json_pack("{s: s, s: o, s: o}", + "type", "ChannelConnectedLine", + "timestamp", ast_json_timeval(*tv, NULL), + "channel", json_channel); +} + static channel_snapshot_monitor channel_monitors[] = { channel_state, channel_dialplan, channel_callerid, + channel_connected_line, }; static void sub_channel_update_handler(void *data, |