[svn-commits] kmoore: branch kmoore/stasis_http_rename r395550 - in /team/kmoore/stasis_htt...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Jul 26 14:23:02 CDT 2013
Author: kmoore
Date: Fri Jul 26 14:23:00 2013
New Revision: 395550
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395550
Log:
More renaming fun
Modified:
team/kmoore/stasis_http_rename/include/asterisk/ari.h
team/kmoore/stasis_http_rename/res/ari/ari_model_validators.c
team/kmoore/stasis_http_rename/res/ari/ari_model_validators.h
team/kmoore/stasis_http_rename/res/ari/ari_websockets.c
team/kmoore/stasis_http_rename/res/ari/cli.c
team/kmoore/stasis_http_rename/res/ari/config.c
team/kmoore/stasis_http_rename/res/ari/internal.h
team/kmoore/stasis_http_rename/res/ari/resource_asterisk.c
team/kmoore/stasis_http_rename/res/ari/resource_asterisk.h
team/kmoore/stasis_http_rename/res/ari/resource_bridges.c
team/kmoore/stasis_http_rename/res/ari/resource_bridges.h
team/kmoore/stasis_http_rename/res/ari/resource_channels.c
team/kmoore/stasis_http_rename/res/ari/resource_channels.h
team/kmoore/stasis_http_rename/res/ari/resource_endpoints.c
team/kmoore/stasis_http_rename/res/ari/resource_endpoints.h
team/kmoore/stasis_http_rename/res/ari/resource_events.c
team/kmoore/stasis_http_rename/res/ari/resource_events.h
team/kmoore/stasis_http_rename/res/ari/resource_playback.c
team/kmoore/stasis_http_rename/res/ari/resource_playback.h
team/kmoore/stasis_http_rename/res/ari/resource_recordings.c
team/kmoore/stasis_http_rename/res/ari/resource_recordings.h
team/kmoore/stasis_http_rename/res/ari/resource_sounds.c
team/kmoore/stasis_http_rename/res/ari/resource_sounds.h
team/kmoore/stasis_http_rename/res/res_ari.c
team/kmoore/stasis_http_rename/res/res_ari.exports.in
team/kmoore/stasis_http_rename/res/res_ari_asterisk.c
team/kmoore/stasis_http_rename/res/res_ari_bridges.c
team/kmoore/stasis_http_rename/res/res_ari_channels.c
team/kmoore/stasis_http_rename/res/res_ari_endpoints.c
team/kmoore/stasis_http_rename/res/res_ari_events.c
team/kmoore/stasis_http_rename/res/res_ari_model.c
team/kmoore/stasis_http_rename/res/res_ari_model.exports.in
team/kmoore/stasis_http_rename/res/res_ari_playback.c
team/kmoore/stasis_http_rename/res/res_ari_recordings.c
team/kmoore/stasis_http_rename/res/res_ari_sounds.c
team/kmoore/stasis_http_rename/rest-api-templates/ari_model_validators.c.mustache
team/kmoore/stasis_http_rename/rest-api-templates/ari_model_validators.h.mustache
team/kmoore/stasis_http_rename/rest-api-templates/ari_resource.c.mustache
team/kmoore/stasis_http_rename/rest-api-templates/ari_resource.h.mustache
team/kmoore/stasis_http_rename/rest-api-templates/res_ari_resource.c.mustache
team/kmoore/stasis_http_rename/rest-api-templates/rest_handler.mustache
team/kmoore/stasis_http_rename/tests/test_ari.c
team/kmoore/stasis_http_rename/tests/test_ari_model.c
Modified: team/kmoore/stasis_http_rename/include/asterisk/ari.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis_http_rename/include/asterisk/ari.h?view=diff&rev=395550&r1=395549&r2=395550
==============================================================================
--- team/kmoore/stasis_http_rename/include/asterisk/ari.h (original)
+++ team/kmoore/stasis_http_rename/include/asterisk/ari.h Fri Jul 26 14:23:00 2013
@@ -37,9 +37,9 @@
* \brief Configured encoding format for JSON output.
* \return JSON output encoding (compact, pretty, etc.)
*/
-enum ast_json_encoding_format ari_json_format(void);
-
-struct ari_response;
+enum ast_json_encoding_format ast_ari_json_format(void);
+
+struct ast_ari_response;
/*!
* \brief Callback type for RESTful method handlers.
@@ -51,7 +51,7 @@
typedef void (*stasis_rest_callback)(struct ast_variable *get_params,
struct ast_variable *path_vars,
struct ast_variable *headers,
- struct ari_response *response);
+ struct ast_ari_response *response);
/*!
* \brief Handler for a single RESTful path segment.
@@ -79,7 +79,7 @@
/*!
* Response type for RESTful requests
*/
-struct ari_response {
+struct ast_ari_response {
/*! Response message */
struct ast_json *message;
/*! \r\n seperated response headers */
@@ -99,7 +99,7 @@
* \return 0 on success.
* \return non-zero on failure.
*/
-int ari_add_handler(struct stasis_rest_handlers *handler);
+int ast_ari_add_handler(struct stasis_rest_handlers *handler);
/*!
* Remove a resource for REST handling.
@@ -107,7 +107,7 @@
* \return 0 on success.
* \return non-zero on failure.
*/
-int ari_remove_handler(struct stasis_rest_handlers *handler);
+int ast_ari_remove_handler(struct stasis_rest_handlers *handler);
/*!
* \internal
@@ -123,10 +123,10 @@
* \param headers HTTP headers.
* \param[out] response RESTful HTTP response.
*/
-void ari_invoke(struct ast_tcptls_session_instance *ser,
+void ast_ari_invoke(struct ast_tcptls_session_instance *ser,
const char *uri, enum ast_http_method method,
struct ast_variable *get_params, struct ast_variable *headers,
- struct ari_response *response);
+ struct ast_ari_response *response);
/*!
* \internal
@@ -139,10 +139,10 @@
* \param headers HTTP headers.
* \param[out] response RESTful HTTP response.
*/
-void ari_get_docs(const char *uri, struct ast_variable *headers, struct ari_response *response);
+void ast_ari_get_docs(const char *uri, struct ast_variable *headers, struct ast_ari_response *response);
/*! \brief Abstraction for reading/writing JSON to a WebSocket */
-struct ari_websocket_session;
+struct ast_ari_websocket_session;
/*!
* \brief Create an ARI WebSocket session.
@@ -155,7 +155,7 @@
* \return New ARI WebSocket session.
* \return \c NULL on error.
*/
-struct ari_websocket_session *ari_websocket_session_create(
+struct ast_ari_websocket_session *ast_ari_websocket_session_create(
struct ast_websocket *ws_session, int (*validator)(struct ast_json *));
/*!
@@ -165,8 +165,8 @@
* \return Message received.
* \return \c NULL if WebSocket could not be read.
*/
-struct ast_json *ari_websocket_session_read(
- struct ari_websocket_session *session);
+struct ast_json *ast_ari_websocket_session_read(
+ struct ast_ari_websocket_session *session);
/*!
* \brief Send a message to an ARI WebSocket.
@@ -176,7 +176,7 @@
* \return 0 on success.
* \return Non-zero on error.
*/
-int ari_websocket_session_write(struct ari_websocket_session *session,
+int ast_ari_websocket_session_write(struct ast_ari_websocket_session *session,
struct ast_json *message);
/*!
@@ -187,45 +187,45 @@
*
* \return JSON message specifying an out-of-memory error.
*/
-struct ast_json *ari_oom_json(void);
-
-/*!
- * \brief Fill in an error \a ari_response.
+struct ast_json *ast_ari_oom_json(void);
+
+/*!
+ * \brief Fill in an error \a ast_ari_response.
* \param response Response to fill in.
* \param response_code HTTP response code.
* \param response_text Text corresponding to the HTTP response code.
* \param message_fmt Error message format string.
*/
-void ari_response_error(struct ari_response *response,
+void ast_ari_response_error(struct ast_ari_response *response,
int response_code,
const char *response_text,
const char *message_fmt, ...)
__attribute__((format(printf, 4, 5)));
/*!
- * \brief Fill in an \c OK (200) \a ari_response.
+ * \brief Fill in an \c OK (200) \a ast_ari_response.
* \param response Response to fill in.
* \param message JSON response. This reference is stolen, so just \ref
* ast_json_incref if you need to keep a reference to it.
*/
-void ari_response_ok(struct ari_response *response,
+void ast_ari_response_ok(struct ast_ari_response *response,
struct ast_json *message);
/*!
- * \brief Fill in a <tt>No Content</tt> (204) \a ari_response.
- */
-void ari_response_no_content(struct ari_response *response);
-
-/*!
- * \brief Fill in a <tt>Created</tt> (201) \a ari_response.
- */
-void ari_response_created(struct ari_response *response,
+ * \brief Fill in a <tt>No Content</tt> (204) \a ast_ari_response.
+ */
+void ast_ari_response_no_content(struct ast_ari_response *response);
+
+/*!
+ * \brief Fill in a <tt>Created</tt> (201) \a ast_ari_response.
+ */
+void ast_ari_response_created(struct ast_ari_response *response,
const char *url, struct ast_json *message);
/*!
* \brief Fill in \a response with a 500 message for allocation failures.
* \param response Response to fill in.
*/
-void ari_response_alloc_failed(struct ari_response *response);
+void ast_ari_response_alloc_failed(struct ast_ari_response *response);
#endif /* _ASTERISK_ARI_H */
Modified: team/kmoore/stasis_http_rename/res/ari/ari_model_validators.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis_http_rename/res/ari/ari_model_validators.c?view=diff&rev=395550&r1=395549&r2=395550
==============================================================================
--- team/kmoore/stasis_http_rename/res/ari/ari_model_validators.c (original)
+++ team/kmoore/stasis_http_rename/res/ari/ari_model_validators.c Fri Jul 26 14:23:00 2013
@@ -35,7 +35,7 @@
#include "asterisk/module.h"
#include "ari_model_validators.h"
-int ari_validate_asterisk_info(struct ast_json *json)
+int ast_ari_validate_asterisk_info(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -52,12 +52,12 @@
return res;
}
-ari_validator ari_validate_asterisk_info_fn(void)
-{
- return ari_validate_asterisk_info;
-}
-
-int ari_validate_variable(struct ast_json *json)
+ari_validator ast_ari_validate_asterisk_info_fn(void)
+{
+ return ast_ari_validate_asterisk_info;
+}
+
+int ast_ari_validate_variable(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -67,7 +67,7 @@
if (strcmp("value", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_value = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Variable field value failed validation\n");
@@ -90,12 +90,12 @@
return res;
}
-ari_validator ari_validate_variable_fn(void)
-{
- return ari_validate_variable;
-}
-
-int ari_validate_endpoint(struct ast_json *json)
+ari_validator ast_ari_validate_variable_fn(void)
+{
+ return ast_ari_validate_variable;
+}
+
+int ast_ari_validate_endpoint(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -107,9 +107,9 @@
if (strcmp("channel_ids", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_channel_ids = 1;
- prop_is_valid = ari_validate_list(
+ prop_is_valid = ast_ari_validate_list(
ast_json_object_iter_value(iter),
- ari_validate_string);
+ ast_ari_validate_string);
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Endpoint field channel_ids failed validation\n");
res = 0;
@@ -118,7 +118,7 @@
if (strcmp("resource", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_resource = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Endpoint field resource failed validation\n");
@@ -127,7 +127,7 @@
} else
if (strcmp("state", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Endpoint field state failed validation\n");
@@ -137,7 +137,7 @@
if (strcmp("technology", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_technology = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Endpoint field technology failed validation\n");
@@ -170,12 +170,12 @@
return res;
}
-ari_validator ari_validate_endpoint_fn(void)
-{
- return ari_validate_endpoint;
-}
-
-int ari_validate_caller_id(struct ast_json *json)
+ari_validator ast_ari_validate_endpoint_fn(void)
+{
+ return ast_ari_validate_endpoint;
+}
+
+int ast_ari_validate_caller_id(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -186,7 +186,7 @@
if (strcmp("name", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_name = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI CallerID field name failed validation\n");
@@ -196,7 +196,7 @@
if (strcmp("number", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_number = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI CallerID field number failed validation\n");
@@ -224,12 +224,12 @@
return res;
}
-ari_validator ari_validate_caller_id_fn(void)
-{
- return ari_validate_caller_id;
-}
-
-int ari_validate_channel(struct ast_json *json)
+ari_validator ast_ari_validate_caller_id_fn(void)
+{
+ return ast_ari_validate_caller_id;
+}
+
+int ast_ari_validate_channel(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -246,7 +246,7 @@
if (strcmp("accountcode", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_accountcode = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Channel field accountcode failed validation\n");
@@ -256,7 +256,7 @@
if (strcmp("caller", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_caller = 1;
- prop_is_valid = ari_validate_caller_id(
+ prop_is_valid = ast_ari_validate_caller_id(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Channel field caller failed validation\n");
@@ -266,7 +266,7 @@
if (strcmp("connected", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_connected = 1;
- prop_is_valid = ari_validate_caller_id(
+ prop_is_valid = ast_ari_validate_caller_id(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Channel field connected failed validation\n");
@@ -276,7 +276,7 @@
if (strcmp("creationtime", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_creationtime = 1;
- prop_is_valid = ari_validate_date(
+ prop_is_valid = ast_ari_validate_date(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Channel field creationtime failed validation\n");
@@ -286,7 +286,7 @@
if (strcmp("dialplan", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_dialplan = 1;
- prop_is_valid = ari_validate_dialplan_cep(
+ prop_is_valid = ast_ari_validate_dialplan_cep(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Channel field dialplan failed validation\n");
@@ -296,7 +296,7 @@
if (strcmp("id", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_id = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Channel field id failed validation\n");
@@ -306,7 +306,7 @@
if (strcmp("name", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_name = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Channel field name failed validation\n");
@@ -316,7 +316,7 @@
if (strcmp("state", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_state = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Channel field state failed validation\n");
@@ -374,12 +374,12 @@
return res;
}
-ari_validator ari_validate_channel_fn(void)
-{
- return ari_validate_channel;
-}
-
-int ari_validate_dialed(struct ast_json *json)
+ari_validator ast_ari_validate_channel_fn(void)
+{
+ return ast_ari_validate_channel;
+}
+
+int ast_ari_validate_dialed(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -396,12 +396,12 @@
return res;
}
-ari_validator ari_validate_dialed_fn(void)
-{
- return ari_validate_dialed;
-}
-
-int ari_validate_dialplan_cep(struct ast_json *json)
+ari_validator ast_ari_validate_dialed_fn(void)
+{
+ return ast_ari_validate_dialed;
+}
+
+int ast_ari_validate_dialplan_cep(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -413,7 +413,7 @@
if (strcmp("context", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_context = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI DialplanCEP field context failed validation\n");
@@ -423,7 +423,7 @@
if (strcmp("exten", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_exten = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI DialplanCEP field exten failed validation\n");
@@ -433,7 +433,7 @@
if (strcmp("priority", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_priority = 1;
- prop_is_valid = ari_validate_long(
+ prop_is_valid = ast_ari_validate_long(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI DialplanCEP field priority failed validation\n");
@@ -466,12 +466,12 @@
return res;
}
-ari_validator ari_validate_dialplan_cep_fn(void)
-{
- return ari_validate_dialplan_cep;
-}
-
-int ari_validate_bridge(struct ast_json *json)
+ari_validator ast_ari_validate_dialplan_cep_fn(void)
+{
+ return ast_ari_validate_dialplan_cep;
+}
+
+int ast_ari_validate_bridge(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -485,7 +485,7 @@
if (strcmp("bridge_class", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_bridge_class = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Bridge field bridge_class failed validation\n");
@@ -495,7 +495,7 @@
if (strcmp("bridge_type", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_bridge_type = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Bridge field bridge_type failed validation\n");
@@ -505,9 +505,9 @@
if (strcmp("channels", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_channels = 1;
- prop_is_valid = ari_validate_list(
+ prop_is_valid = ast_ari_validate_list(
ast_json_object_iter_value(iter),
- ari_validate_string);
+ ast_ari_validate_string);
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Bridge field channels failed validation\n");
res = 0;
@@ -516,7 +516,7 @@
if (strcmp("id", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_id = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Bridge field id failed validation\n");
@@ -526,7 +526,7 @@
if (strcmp("technology", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_technology = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Bridge field technology failed validation\n");
@@ -569,12 +569,12 @@
return res;
}
-ari_validator ari_validate_bridge_fn(void)
-{
- return ari_validate_bridge;
-}
-
-int ari_validate_live_recording(struct ast_json *json)
+ari_validator ast_ari_validate_bridge_fn(void)
+{
+ return ast_ari_validate_bridge;
+}
+
+int ast_ari_validate_live_recording(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -586,7 +586,7 @@
if (strcmp("format", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_format = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI LiveRecording field format failed validation\n");
@@ -596,7 +596,7 @@
if (strcmp("name", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_name = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI LiveRecording field name failed validation\n");
@@ -606,7 +606,7 @@
if (strcmp("state", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_state = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI LiveRecording field state failed validation\n");
@@ -639,12 +639,12 @@
return res;
}
-ari_validator ari_validate_live_recording_fn(void)
-{
- return ari_validate_live_recording;
-}
-
-int ari_validate_stored_recording(struct ast_json *json)
+ari_validator ast_ari_validate_live_recording_fn(void)
+{
+ return ast_ari_validate_live_recording;
+}
+
+int ast_ari_validate_stored_recording(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -654,7 +654,7 @@
for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) {
if (strcmp("duration_seconds", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
- prop_is_valid = ari_validate_int(
+ prop_is_valid = ast_ari_validate_int(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI StoredRecording field duration_seconds failed validation\n");
@@ -664,9 +664,9 @@
if (strcmp("formats", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_formats = 1;
- prop_is_valid = ari_validate_list(
+ prop_is_valid = ast_ari_validate_list(
ast_json_object_iter_value(iter),
- ari_validate_string);
+ ast_ari_validate_string);
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI StoredRecording field formats failed validation\n");
res = 0;
@@ -675,7 +675,7 @@
if (strcmp("id", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_id = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI StoredRecording field id failed validation\n");
@@ -684,7 +684,7 @@
} else
if (strcmp("time", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
- prop_is_valid = ari_validate_date(
+ prop_is_valid = ast_ari_validate_date(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI StoredRecording field time failed validation\n");
@@ -712,12 +712,12 @@
return res;
}
-ari_validator ari_validate_stored_recording_fn(void)
-{
- return ari_validate_stored_recording;
-}
-
-int ari_validate_format_lang_pair(struct ast_json *json)
+ari_validator ast_ari_validate_stored_recording_fn(void)
+{
+ return ast_ari_validate_stored_recording;
+}
+
+int ast_ari_validate_format_lang_pair(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -728,7 +728,7 @@
if (strcmp("format", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_format = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI FormatLangPair field format failed validation\n");
@@ -738,7 +738,7 @@
if (strcmp("language", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_language = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI FormatLangPair field language failed validation\n");
@@ -766,12 +766,12 @@
return res;
}
-ari_validator ari_validate_format_lang_pair_fn(void)
-{
- return ari_validate_format_lang_pair;
-}
-
-int ari_validate_sound(struct ast_json *json)
+ari_validator ast_ari_validate_format_lang_pair_fn(void)
+{
+ return ast_ari_validate_format_lang_pair;
+}
+
+int ast_ari_validate_sound(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -782,9 +782,9 @@
if (strcmp("formats", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_formats = 1;
- prop_is_valid = ari_validate_list(
+ prop_is_valid = ast_ari_validate_list(
ast_json_object_iter_value(iter),
- ari_validate_format_lang_pair);
+ ast_ari_validate_format_lang_pair);
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Sound field formats failed validation\n");
res = 0;
@@ -793,7 +793,7 @@
if (strcmp("id", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_id = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Sound field id failed validation\n");
@@ -802,7 +802,7 @@
} else
if (strcmp("text", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Sound field text failed validation\n");
@@ -830,12 +830,12 @@
return res;
}
-ari_validator ari_validate_sound_fn(void)
-{
- return ari_validate_sound;
-}
-
-int ari_validate_playback(struct ast_json *json)
+ari_validator ast_ari_validate_sound_fn(void)
+{
+ return ast_ari_validate_sound;
+}
+
+int ast_ari_validate_playback(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -848,7 +848,7 @@
if (strcmp("id", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_id = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Playback field id failed validation\n");
@@ -857,7 +857,7 @@
} else
if (strcmp("language", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Playback field language failed validation\n");
@@ -867,7 +867,7 @@
if (strcmp("media_uri", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_media_uri = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Playback field media_uri failed validation\n");
@@ -877,7 +877,7 @@
if (strcmp("state", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_state = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Playback field state failed validation\n");
@@ -887,7 +887,7 @@
if (strcmp("target_uri", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_target_uri = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI Playback field target_uri failed validation\n");
@@ -925,12 +925,12 @@
return res;
}
-ari_validator ari_validate_playback_fn(void)
-{
- return ari_validate_playback;
-}
-
-int ari_validate_application_replaced(struct ast_json *json)
+ari_validator ast_ari_validate_playback_fn(void)
+{
+ return ast_ari_validate_playback;
+}
+
+int ast_ari_validate_application_replaced(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -941,7 +941,7 @@
if (strcmp("type", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_type = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI ApplicationReplaced field type failed validation\n");
@@ -951,7 +951,7 @@
if (strcmp("application", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_application = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI ApplicationReplaced field application failed validation\n");
@@ -960,7 +960,7 @@
} else
if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
- prop_is_valid = ari_validate_date(
+ prop_is_valid = ast_ari_validate_date(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI ApplicationReplaced field timestamp failed validation\n");
@@ -988,12 +988,12 @@
return res;
}
-ari_validator ari_validate_application_replaced_fn(void)
-{
- return ari_validate_application_replaced;
-}
-
-int ari_validate_bridge_created(struct ast_json *json)
+ari_validator ast_ari_validate_application_replaced_fn(void)
+{
+ return ast_ari_validate_application_replaced;
+}
+
+int ast_ari_validate_bridge_created(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -1005,7 +1005,7 @@
if (strcmp("type", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_type = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeCreated field type failed validation\n");
@@ -1015,7 +1015,7 @@
if (strcmp("application", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_application = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeCreated field application failed validation\n");
@@ -1024,7 +1024,7 @@
} else
if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
- prop_is_valid = ari_validate_date(
+ prop_is_valid = ast_ari_validate_date(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeCreated field timestamp failed validation\n");
@@ -1034,7 +1034,7 @@
if (strcmp("bridge", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_bridge = 1;
- prop_is_valid = ari_validate_bridge(
+ prop_is_valid = ast_ari_validate_bridge(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeCreated field bridge failed validation\n");
@@ -1067,12 +1067,12 @@
return res;
}
-ari_validator ari_validate_bridge_created_fn(void)
-{
- return ari_validate_bridge_created;
-}
-
-int ari_validate_bridge_destroyed(struct ast_json *json)
+ari_validator ast_ari_validate_bridge_created_fn(void)
+{
+ return ast_ari_validate_bridge_created;
+}
+
+int ast_ari_validate_bridge_destroyed(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -1084,7 +1084,7 @@
if (strcmp("type", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_type = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeDestroyed field type failed validation\n");
@@ -1094,7 +1094,7 @@
if (strcmp("application", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_application = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeDestroyed field application failed validation\n");
@@ -1103,7 +1103,7 @@
} else
if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
- prop_is_valid = ari_validate_date(
+ prop_is_valid = ast_ari_validate_date(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeDestroyed field timestamp failed validation\n");
@@ -1113,7 +1113,7 @@
if (strcmp("bridge", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_bridge = 1;
- prop_is_valid = ari_validate_bridge(
+ prop_is_valid = ast_ari_validate_bridge(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeDestroyed field bridge failed validation\n");
@@ -1146,12 +1146,12 @@
return res;
}
-ari_validator ari_validate_bridge_destroyed_fn(void)
-{
- return ari_validate_bridge_destroyed;
-}
-
-int ari_validate_bridge_merged(struct ast_json *json)
+ari_validator ast_ari_validate_bridge_destroyed_fn(void)
+{
+ return ast_ari_validate_bridge_destroyed;
+}
+
+int ast_ari_validate_bridge_merged(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -1164,7 +1164,7 @@
if (strcmp("type", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_type = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeMerged field type failed validation\n");
@@ -1174,7 +1174,7 @@
if (strcmp("application", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_application = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeMerged field application failed validation\n");
@@ -1183,7 +1183,7 @@
} else
if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
- prop_is_valid = ari_validate_date(
+ prop_is_valid = ast_ari_validate_date(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeMerged field timestamp failed validation\n");
@@ -1193,7 +1193,7 @@
if (strcmp("bridge", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_bridge = 1;
- prop_is_valid = ari_validate_bridge(
+ prop_is_valid = ast_ari_validate_bridge(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeMerged field bridge failed validation\n");
@@ -1203,7 +1203,7 @@
if (strcmp("bridge_from", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_bridge_from = 1;
- prop_is_valid = ari_validate_bridge(
+ prop_is_valid = ast_ari_validate_bridge(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI BridgeMerged field bridge_from failed validation\n");
@@ -1241,12 +1241,12 @@
return res;
}
-ari_validator ari_validate_bridge_merged_fn(void)
-{
- return ari_validate_bridge_merged;
-}
-
-int ari_validate_channel_caller_id(struct ast_json *json)
+ari_validator ast_ari_validate_bridge_merged_fn(void)
+{
+ return ast_ari_validate_bridge_merged;
+}
+
+int ast_ari_validate_channel_caller_id(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -1260,7 +1260,7 @@
if (strcmp("type", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_type = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI ChannelCallerId field type failed validation\n");
@@ -1270,7 +1270,7 @@
if (strcmp("application", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_application = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI ChannelCallerId field application failed validation\n");
@@ -1279,7 +1279,7 @@
} else
if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
- prop_is_valid = ari_validate_date(
+ prop_is_valid = ast_ari_validate_date(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI ChannelCallerId field timestamp failed validation\n");
@@ -1289,7 +1289,7 @@
if (strcmp("caller_presentation", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_caller_presentation = 1;
- prop_is_valid = ari_validate_int(
+ prop_is_valid = ast_ari_validate_int(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI ChannelCallerId field caller_presentation failed validation\n");
@@ -1299,7 +1299,7 @@
if (strcmp("caller_presentation_txt", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_caller_presentation_txt = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI ChannelCallerId field caller_presentation_txt failed validation\n");
@@ -1309,7 +1309,7 @@
if (strcmp("channel", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_channel = 1;
- prop_is_valid = ari_validate_channel(
+ prop_is_valid = ast_ari_validate_channel(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI ChannelCallerId field channel failed validation\n");
@@ -1352,12 +1352,12 @@
return res;
}
-ari_validator ari_validate_channel_caller_id_fn(void)
-{
- return ari_validate_channel_caller_id;
-}
-
-int ari_validate_channel_created(struct ast_json *json)
+ari_validator ast_ari_validate_channel_caller_id_fn(void)
+{
+ return ast_ari_validate_channel_caller_id;
+}
+
+int ast_ari_validate_channel_created(struct ast_json *json)
{
int res = 1;
struct ast_json_iter *iter;
@@ -1369,7 +1369,7 @@
if (strcmp("type", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_type = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI ChannelCreated field type failed validation\n");
@@ -1379,7 +1379,7 @@
if (strcmp("application", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
has_application = 1;
- prop_is_valid = ari_validate_string(
+ prop_is_valid = ast_ari_validate_string(
ast_json_object_iter_value(iter));
if (!prop_is_valid) {
ast_log(LOG_ERROR, "ARI ChannelCreated field application failed validation\n");
@@ -1388,7 +1388,7 @@
} else
if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) {
int prop_is_valid;
- prop_is_valid = ari_validate_date(
[... 9012 lines stripped ...]
More information about the svn-commits
mailing list