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

Add new AMI and ARI events for connected line changes on a channel.

Browse Source 
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



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@429064 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2014-12-08 15:49:24 +00:00
parent 55c9a46abd
commit 93b1df3bf6
9 changed files with 203 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
res/ari/ari_model_validators.c
View File

@@ -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

23
res/ari/ari_model_validators.h
View File

@@ -680,6 +680,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.
*
@@ -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)