diff options
Diffstat (limited to 'res/ari')
-rw-r--r-- | res/ari/ari_model_validators.c | 130 | ||||
-rw-r--r-- | res/ari/ari_model_validators.h | 61 | ||||
-rw-r--r-- | res/ari/resource_bridges.c | 2 | ||||
-rw-r--r-- | res/ari/resource_channels.c | 2 |
4 files changed, 193 insertions, 2 deletions
diff --git a/res/ari/ari_model_validators.c b/res/ari/ari_model_validators.c index aec2bb471..9634a473c 100644 --- a/res/ari/ari_model_validators.c +++ b/res/ari/ari_model_validators.c @@ -3288,6 +3288,136 @@ ari_validator ast_ari_validate_playback_started_fn(void) return ast_ari_validate_playback_started; } +int ast_ari_validate_recording_failed(struct ast_json *json) +{ + int res = 1; + struct ast_json_iter *iter; + int has_cause = 0; + int has_recording = 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) { + int prop_is_valid; + has_cause = 1; + prop_is_valid = ast_ari_validate_string( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI RecordingFailed field cause failed validation\n"); + res = 0; + } + } else + if (strcmp("recording", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + has_recording = 1; + prop_is_valid = ast_ari_validate_live_recording( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI RecordingFailed field recording failed validation\n"); + res = 0; + } + } else + { + ast_log(LOG_ERROR, + "ARI RecordingFailed has undocumented field %s\n", + ast_json_object_iter_key(iter)); + res = 0; + } + } + + if (!has_cause) { + ast_log(LOG_ERROR, "ARI RecordingFailed missing required field cause\n"); + res = 0; + } + + if (!has_recording) { + ast_log(LOG_ERROR, "ARI RecordingFailed missing required field recording\n"); + res = 0; + } + + return res; +} + +ari_validator ast_ari_validate_recording_failed_fn(void) +{ + return ast_ari_validate_recording_failed; +} + +int ast_ari_validate_recording_finished(struct ast_json *json) +{ + int res = 1; + struct ast_json_iter *iter; + int has_recording = 0; + + for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) { + if (strcmp("recording", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + has_recording = 1; + prop_is_valid = ast_ari_validate_live_recording( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI RecordingFinished field recording failed validation\n"); + res = 0; + } + } else + { + ast_log(LOG_ERROR, + "ARI RecordingFinished has undocumented field %s\n", + ast_json_object_iter_key(iter)); + res = 0; + } + } + + if (!has_recording) { + ast_log(LOG_ERROR, "ARI RecordingFinished missing required field recording\n"); + res = 0; + } + + return res; +} + +ari_validator ast_ari_validate_recording_finished_fn(void) +{ + return ast_ari_validate_recording_finished; +} + +int ast_ari_validate_recording_started(struct ast_json *json) +{ + int res = 1; + struct ast_json_iter *iter; + int has_recording = 0; + + for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) { + if (strcmp("recording", ast_json_object_iter_key(iter)) == 0) { + int prop_is_valid; + has_recording = 1; + prop_is_valid = ast_ari_validate_live_recording( + ast_json_object_iter_value(iter)); + if (!prop_is_valid) { + ast_log(LOG_ERROR, "ARI RecordingStarted field recording failed validation\n"); + res = 0; + } + } else + { + ast_log(LOG_ERROR, + "ARI RecordingStarted has undocumented field %s\n", + ast_json_object_iter_key(iter)); + res = 0; + } + } + + if (!has_recording) { + ast_log(LOG_ERROR, "ARI RecordingStarted missing required field recording\n"); + res = 0; + } + + return res; +} + +ari_validator ast_ari_validate_recording_started_fn(void) +{ + return ast_ari_validate_recording_started; +} + int ast_ari_validate_stasis_end(struct ast_json *json) { int res = 1; diff --git a/res/ari/ari_model_validators.h b/res/ari/ari_model_validators.h index 6aa6a2a14..afa3961d6 100644 --- a/res/ari/ari_model_validators.h +++ b/res/ari/ari_model_validators.h @@ -863,6 +863,60 @@ int ast_ari_validate_playback_started(struct ast_json *json); ari_validator ast_ari_validate_playback_started_fn(void); /*! + * \brief Validator for RecordingFailed. + * + * Event showing failure of a recording operation. + * + * \param json JSON object to validate. + * \returns True (non-zero) if valid. + * \returns False (zero) if invalid. + */ +int ast_ari_validate_recording_failed(struct ast_json *json); + +/*! + * \brief Function pointer to ast_ari_validate_recording_failed(). + * + * See \ref ast_ari_model_validators.h for more details. + */ +ari_validator ast_ari_validate_recording_failed_fn(void); + +/*! + * \brief Validator for RecordingFinished. + * + * Event showing the completion of a recording operation. + * + * \param json JSON object to validate. + * \returns True (non-zero) if valid. + * \returns False (zero) if invalid. + */ +int ast_ari_validate_recording_finished(struct ast_json *json); + +/*! + * \brief Function pointer to ast_ari_validate_recording_finished(). + * + * See \ref ast_ari_model_validators.h for more details. + */ +ari_validator ast_ari_validate_recording_finished_fn(void); + +/*! + * \brief Validator for RecordingStarted. + * + * Event showing the start of a recording operation. + * + * \param json JSON object to validate. + * \returns True (non-zero) if valid. + * \returns False (zero) if invalid. + */ +int ast_ari_validate_recording_started(struct ast_json *json); + +/*! + * \brief Function pointer to ast_ari_validate_recording_started(). + * + * See \ref ast_ari_model_validators.h for more details. + */ +ari_validator ast_ari_validate_recording_started_fn(void); + +/*! * \brief Validator for StasisEnd. * * Notification that a channel has left a Stasis appliction. @@ -1112,6 +1166,13 @@ ari_validator ast_ari_validate_application_fn(void); * - application: string (required) * - timestamp: Date * - playback: Playback (required) + * RecordingFailed + * - cause: string (required) + * - recording: LiveRecording (required) + * RecordingFinished + * - recording: LiveRecording (required) + * RecordingStarted + * - recording: LiveRecording (required) * StasisEnd * - type: string (required) * - application: string (required) diff --git a/res/ari/resource_bridges.c b/res/ari/resource_bridges.c index 77d5660ca..a036ce0f3 100644 --- a/res/ari/resource_bridges.c +++ b/res/ari/resource_bridges.c @@ -452,7 +452,7 @@ void ast_ari_record_bridge(struct ast_variable *headers, struct ast_record_bridg break; case EEXIST: ast_ari_response_error(response, 409, "Conflict", - "Recording '%s' already in progress", + "Recording '%s' already exists and can not be overwritten", args->name); break; case ENOMEM: diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c index bdca21cdb..b8d59d38b 100644 --- a/res/ari/resource_channels.c +++ b/res/ari/resource_channels.c @@ -420,7 +420,7 @@ void ast_ari_record_channel(struct ast_variable *headers, break; case EEXIST: ast_ari_response_error(response, 409, "Conflict", - "Recording '%s' already in progress", + "Recording '%s' already exists and can not be overwritten", args->name); break; case ENOMEM: |