Multiple revisions 419565-419566
[asterisk/asterisk.git] / res / ari / ari_model_validators.c
index 7ddef27..0302db3 100644 (file)
@@ -891,7 +891,9 @@ int ast_ari_validate_bridge(struct ast_json *json)
        int has_bridge_class = 0;
        int has_bridge_type = 0;
        int has_channels = 0;
+       int has_creator = 0;
        int has_id = 0;
+       int has_name = 0;
        int has_technology = 0;
 
        for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) {
@@ -926,6 +928,16 @@ int ast_ari_validate_bridge(struct ast_json *json)
                                res = 0;
                        }
                } else
+               if (strcmp("creator", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_creator = 1;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI Bridge field creator failed validation\n");
+                               res = 0;
+                       }
+               } else
                if (strcmp("id", ast_json_object_iter_key(iter)) == 0) {
                        int prop_is_valid;
                        has_id = 1;
@@ -936,6 +948,16 @@ int ast_ari_validate_bridge(struct ast_json *json)
                                res = 0;
                        }
                } else
+               if (strcmp("name", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_name = 1;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI Bridge field name failed validation\n");
+                               res = 0;
+                       }
+               } else
                if (strcmp("technology", ast_json_object_iter_key(iter)) == 0) {
                        int prop_is_valid;
                        has_technology = 1;
@@ -969,11 +991,21 @@ int ast_ari_validate_bridge(struct ast_json *json)
                res = 0;
        }
 
+       if (!has_creator) {
+               ast_log(LOG_ERROR, "ARI Bridge missing required field creator\n");
+               res = 0;
+       }
+
        if (!has_id) {
                ast_log(LOG_ERROR, "ARI Bridge missing required field id\n");
                res = 0;
        }
 
+       if (!has_name) {
+               ast_log(LOG_ERROR, "ARI Bridge missing required field name\n");
+               res = 0;
+       }
+
        if (!has_technology) {
                ast_log(LOG_ERROR, "ARI Bridge missing required field technology\n");
                res = 0;
@@ -994,6 +1026,7 @@ int ast_ari_validate_live_recording(struct ast_json *json)
        int has_format = 0;
        int has_name = 0;
        int has_state = 0;
+       int has_target_uri = 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) {
@@ -1005,6 +1038,15 @@ int ast_ari_validate_live_recording(struct ast_json *json)
                                res = 0;
                        }
                } else
+               if (strcmp("duration", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_int(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI LiveRecording field duration failed validation\n");
+                               res = 0;
+                       }
+               } else
                if (strcmp("format", ast_json_object_iter_key(iter)) == 0) {
                        int prop_is_valid;
                        has_format = 1;
@@ -1025,6 +1067,15 @@ int ast_ari_validate_live_recording(struct ast_json *json)
                                res = 0;
                        }
                } else
+               if (strcmp("silence_duration", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_int(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI LiveRecording field silence_duration failed validation\n");
+                               res = 0;
+                       }
+               } else
                if (strcmp("state", ast_json_object_iter_key(iter)) == 0) {
                        int prop_is_valid;
                        has_state = 1;
@@ -1035,6 +1086,25 @@ int ast_ari_validate_live_recording(struct ast_json *json)
                                res = 0;
                        }
                } else
+               if (strcmp("talking_duration", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_int(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI LiveRecording field talking_duration failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("target_uri", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_target_uri = 1;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI LiveRecording field target_uri failed validation\n");
+                               res = 0;
+                       }
+               } else
                {
                        ast_log(LOG_ERROR,
                                "ARI LiveRecording has undocumented field %s\n",
@@ -1058,6 +1128,11 @@ int ast_ari_validate_live_recording(struct ast_json *json)
                res = 0;
        }
 
+       if (!has_target_uri) {
+               ast_log(LOG_ERROR, "ARI LiveRecording missing required field target_uri\n");
+               res = 0;
+       }
+
        return res;
 }
 
@@ -1361,93 +1436,530 @@ int ast_ari_validate_device_state(struct ast_json *json)
                                res = 0;
                        }
                } else
-               {
-                       ast_log(LOG_ERROR,
-                               "ARI DeviceState has undocumented field %s\n",
-                               ast_json_object_iter_key(iter));
-                       res = 0;
-               }
-       }
-
-       if (!has_name) {
-               ast_log(LOG_ERROR, "ARI DeviceState missing required field name\n");
-               res = 0;
-       }
-
-       if (!has_state) {
-               ast_log(LOG_ERROR, "ARI DeviceState missing required field state\n");
-               res = 0;
-       }
-
-       return res;
-}
-
-ari_validator ast_ari_validate_device_state_fn(void)
-{
-       return ast_ari_validate_device_state;
-}
-
-int ast_ari_validate_application_replaced(struct ast_json *json)
-{
-       int res = 1;
-       struct ast_json_iter *iter;
-       int has_type = 0;
-       int has_application = 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) {
+               {
+                       ast_log(LOG_ERROR,
+                               "ARI DeviceState has undocumented field %s\n",
+                               ast_json_object_iter_key(iter));
+                       res = 0;
+               }
+       }
+
+       if (!has_name) {
+               ast_log(LOG_ERROR, "ARI DeviceState missing required field name\n");
+               res = 0;
+       }
+
+       if (!has_state) {
+               ast_log(LOG_ERROR, "ARI DeviceState missing required field state\n");
+               res = 0;
+       }
+
+       return res;
+}
+
+ari_validator ast_ari_validate_device_state_fn(void)
+{
+       return ast_ari_validate_device_state;
+}
+
+int ast_ari_validate_mailbox(struct ast_json *json)
+{
+       int res = 1;
+       struct ast_json_iter *iter;
+       int has_name = 0;
+       int has_new_messages = 0;
+       int has_old_messages = 0;
+
+       for (iter = ast_json_object_iter(json); iter; iter = ast_json_object_iter_next(json, iter)) {
+               if (strcmp("name", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_name = 1;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI Mailbox field name failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("new_messages", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_new_messages = 1;
+                       prop_is_valid = ast_ari_validate_int(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI Mailbox field new_messages failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("old_messages", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_old_messages = 1;
+                       prop_is_valid = ast_ari_validate_int(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI Mailbox field old_messages failed validation\n");
+                               res = 0;
+                       }
+               } else
+               {
+                       ast_log(LOG_ERROR,
+                               "ARI Mailbox has undocumented field %s\n",
+                               ast_json_object_iter_key(iter));
+                       res = 0;
+               }
+       }
+
+       if (!has_name) {
+               ast_log(LOG_ERROR, "ARI Mailbox missing required field name\n");
+               res = 0;
+       }
+
+       if (!has_new_messages) {
+               ast_log(LOG_ERROR, "ARI Mailbox missing required field new_messages\n");
+               res = 0;
+       }
+
+       if (!has_old_messages) {
+               ast_log(LOG_ERROR, "ARI Mailbox missing required field old_messages\n");
+               res = 0;
+       }
+
+       return res;
+}
+
+ari_validator ast_ari_validate_mailbox_fn(void)
+{
+       return ast_ari_validate_mailbox;
+}
+
+int ast_ari_validate_application_replaced(struct ast_json *json)
+{
+       int res = 1;
+       struct ast_json_iter *iter;
+       int has_type = 0;
+       int has_application = 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 ApplicationReplaced 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 ApplicationReplaced 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 ApplicationReplaced field timestamp failed validation\n");
+                               res = 0;
+                       }
+               } else
+               {
+                       ast_log(LOG_ERROR,
+                               "ARI ApplicationReplaced has undocumented field %s\n",
+                               ast_json_object_iter_key(iter));
+                       res = 0;
+               }
+       }
+
+       if (!has_type) {
+               ast_log(LOG_ERROR, "ARI ApplicationReplaced missing required field type\n");
+               res = 0;
+       }
+
+       if (!has_application) {
+               ast_log(LOG_ERROR, "ARI ApplicationReplaced missing required field application\n");
+               res = 0;
+       }
+
+       return res;
+}
+
+ari_validator ast_ari_validate_application_replaced_fn(void)
+{
+       return ast_ari_validate_application_replaced;
+}
+
+int ast_ari_validate_bridge_attended_transfer(struct ast_json *json)
+{
+       int res = 1;
+       struct ast_json_iter *iter;
+       int has_type = 0;
+       int has_application = 0;
+       int has_destination_type = 0;
+       int has_is_external = 0;
+       int has_result = 0;
+       int has_transferer_first_leg = 0;
+       int has_transferer_second_leg = 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 BridgeAttendedTransfer 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 BridgeAttendedTransfer 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 BridgeAttendedTransfer field timestamp failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("destination_application", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field destination_application failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("destination_bridge", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field destination_bridge failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("destination_link_first_leg", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_channel(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field destination_link_first_leg failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("destination_link_second_leg", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_channel(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field destination_link_second_leg failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("destination_threeway_bridge", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_bridge(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field destination_threeway_bridge failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("destination_threeway_channel", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_channel(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field destination_threeway_channel failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("destination_type", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_destination_type = 1;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field destination_type failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("is_external", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_is_external = 1;
+                       prop_is_valid = ast_ari_validate_boolean(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field is_external failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("result", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_result = 1;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field result failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("transferer_first_leg", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_transferer_first_leg = 1;
+                       prop_is_valid = ast_ari_validate_channel(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field transferer_first_leg failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("transferer_first_leg_bridge", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_bridge(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field transferer_first_leg_bridge failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("transferer_second_leg", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_transferer_second_leg = 1;
+                       prop_is_valid = ast_ari_validate_channel(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field transferer_second_leg failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("transferer_second_leg_bridge", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_bridge(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer field transferer_second_leg_bridge failed validation\n");
+                               res = 0;
+                       }
+               } else
+               {
+                       ast_log(LOG_ERROR,
+                               "ARI BridgeAttendedTransfer has undocumented field %s\n",
+                               ast_json_object_iter_key(iter));
+                       res = 0;
+               }
+       }
+
+       if (!has_type) {
+               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer missing required field type\n");
+               res = 0;
+       }
+
+       if (!has_application) {
+               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer missing required field application\n");
+               res = 0;
+       }
+
+       if (!has_destination_type) {
+               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer missing required field destination_type\n");
+               res = 0;
+       }
+
+       if (!has_is_external) {
+               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer missing required field is_external\n");
+               res = 0;
+       }
+
+       if (!has_result) {
+               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer missing required field result\n");
+               res = 0;
+       }
+
+       if (!has_transferer_first_leg) {
+               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer missing required field transferer_first_leg\n");
+               res = 0;
+       }
+
+       if (!has_transferer_second_leg) {
+               ast_log(LOG_ERROR, "ARI BridgeAttendedTransfer missing required field transferer_second_leg\n");
+               res = 0;
+       }
+
+       return res;
+}
+
+ari_validator ast_ari_validate_bridge_attended_transfer_fn(void)
+{
+       return ast_ari_validate_bridge_attended_transfer;
+}
+
+int ast_ari_validate_bridge_blind_transfer(struct ast_json *json)
+{
+       int res = 1;
+       struct ast_json_iter *iter;
+       int has_type = 0;
+       int has_application = 0;
+       int has_channel = 0;
+       int has_context = 0;
+       int has_exten = 0;
+       int has_is_external = 0;
+       int has_result = 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 BridgeBlindTransfer 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 BridgeBlindTransfer 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 BridgeBlindTransfer field timestamp failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("bridge", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_bridge(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeBlindTransfer field bridge 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 BridgeBlindTransfer field channel failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("context", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_context = 1;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI BridgeBlindTransfer field context failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("exten", ast_json_object_iter_key(iter)) == 0) {
                        int prop_is_valid;
-                       has_type = 1;
+                       has_exten = 1;
                        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");
+                               ast_log(LOG_ERROR, "ARI BridgeBlindTransfer field exten failed validation\n");
                                res = 0;
                        }
                } else
-               if (strcmp("application", ast_json_object_iter_key(iter)) == 0) {
+               if (strcmp("is_external", ast_json_object_iter_key(iter)) == 0) {
                        int prop_is_valid;
-                       has_application = 1;
-                       prop_is_valid = ast_ari_validate_string(
+                       has_is_external = 1;
+                       prop_is_valid = ast_ari_validate_boolean(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ApplicationReplaced field application failed validation\n");
+                               ast_log(LOG_ERROR, "ARI BridgeBlindTransfer field is_external failed validation\n");
                                res = 0;
                        }
                } else
-               if (strcmp("timestamp", ast_json_object_iter_key(iter)) == 0) {
+               if (strcmp("result", ast_json_object_iter_key(iter)) == 0) {
                        int prop_is_valid;
-                       prop_is_valid = ast_ari_validate_date(
+                       has_result = 1;
+                       prop_is_valid = ast_ari_validate_string(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ApplicationReplaced field timestamp failed validation\n");
+                               ast_log(LOG_ERROR, "ARI BridgeBlindTransfer field result failed validation\n");
                                res = 0;
                        }
                } else
                {
                        ast_log(LOG_ERROR,
-                               "ARI ApplicationReplaced has undocumented field %s\n",
+                               "ARI BridgeBlindTransfer has undocumented field %s\n",
                                ast_json_object_iter_key(iter));
                        res = 0;
                }
        }
 
        if (!has_type) {
-               ast_log(LOG_ERROR, "ARI ApplicationReplaced missing required field type\n");
+               ast_log(LOG_ERROR, "ARI BridgeBlindTransfer missing required field type\n");
                res = 0;
        }
 
        if (!has_application) {
-               ast_log(LOG_ERROR, "ARI ApplicationReplaced missing required field application\n");
+               ast_log(LOG_ERROR, "ARI BridgeBlindTransfer missing required field application\n");
+               res = 0;
+       }
+
+       if (!has_channel) {
+               ast_log(LOG_ERROR, "ARI BridgeBlindTransfer missing required field channel\n");
+               res = 0;
+       }
+
+       if (!has_context) {
+               ast_log(LOG_ERROR, "ARI BridgeBlindTransfer missing required field context\n");
+               res = 0;
+       }
+
+       if (!has_exten) {
+               ast_log(LOG_ERROR, "ARI BridgeBlindTransfer missing required field exten\n");
+               res = 0;
+       }
+
+       if (!has_is_external) {
+               ast_log(LOG_ERROR, "ARI BridgeBlindTransfer missing required field is_external\n");
+               res = 0;
+       }
+
+       if (!has_result) {
+               ast_log(LOG_ERROR, "ARI BridgeBlindTransfer missing required field result\n");
                res = 0;
        }
 
        return res;
 }
 
-ari_validator ast_ari_validate_application_replaced_fn(void)
+ari_validator ast_ari_validate_bridge_blind_transfer_fn(void)
 {
-       return ast_ari_validate_application_replaced;
+       return ast_ari_validate_bridge_blind_transfer;
 }
 
 int ast_ari_validate_bridge_created(struct ast_json *json)
@@ -2208,31 +2720,217 @@ int ast_ari_validate_channel_dtmf_received(struct ast_json *json)
                res = 0;
        }
 
-       if (!has_digit) {
-               ast_log(LOG_ERROR, "ARI ChannelDtmfReceived missing required field digit\n");
+       if (!has_digit) {
+               ast_log(LOG_ERROR, "ARI ChannelDtmfReceived missing required field digit\n");
+               res = 0;
+       }
+
+       if (!has_duration_ms) {
+               ast_log(LOG_ERROR, "ARI ChannelDtmfReceived missing required field duration_ms\n");
+               res = 0;
+       }
+
+       return res;
+}
+
+ari_validator ast_ari_validate_channel_dtmf_received_fn(void)
+{
+       return ast_ari_validate_channel_dtmf_received;
+}
+
+int ast_ari_validate_channel_entered_bridge(struct ast_json *json)
+{
+       int res = 1;
+       struct ast_json_iter *iter;
+       int has_type = 0;
+       int has_application = 0;
+       int has_bridge = 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 ChannelEnteredBridge 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 ChannelEnteredBridge 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 ChannelEnteredBridge field timestamp failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("bridge", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_bridge = 1;
+                       prop_is_valid = ast_ari_validate_bridge(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI ChannelEnteredBridge field bridge failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("channel", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_channel(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI ChannelEnteredBridge field channel failed validation\n");
+                               res = 0;
+                       }
+               } else
+               {
+                       ast_log(LOG_ERROR,
+                               "ARI ChannelEnteredBridge has undocumented field %s\n",
+                               ast_json_object_iter_key(iter));
+                       res = 0;
+               }
+       }
+
+       if (!has_type) {
+               ast_log(LOG_ERROR, "ARI ChannelEnteredBridge missing required field type\n");
+               res = 0;
+       }
+
+       if (!has_application) {
+               ast_log(LOG_ERROR, "ARI ChannelEnteredBridge missing required field application\n");
+               res = 0;
+       }
+
+       if (!has_bridge) {
+               ast_log(LOG_ERROR, "ARI ChannelEnteredBridge missing required field bridge\n");
+               res = 0;
+       }
+
+       return res;
+}
+
+ari_validator ast_ari_validate_channel_entered_bridge_fn(void)
+{
+       return ast_ari_validate_channel_entered_bridge;
+}
+
+int ast_ari_validate_channel_hangup_request(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 ChannelHangupRequest 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 ChannelHangupRequest 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 ChannelHangupRequest field timestamp failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("cause", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_int(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI ChannelHangupRequest field cause 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 ChannelHangupRequest field channel failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("soft", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_boolean(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI ChannelHangupRequest field soft failed validation\n");
+                               res = 0;
+                       }
+               } else
+               {
+                       ast_log(LOG_ERROR,
+                               "ARI ChannelHangupRequest has undocumented field %s\n",
+                               ast_json_object_iter_key(iter));
+                       res = 0;
+               }
+       }
+
+       if (!has_type) {
+               ast_log(LOG_ERROR, "ARI ChannelHangupRequest missing required field type\n");
+               res = 0;
+       }
+
+       if (!has_application) {
+               ast_log(LOG_ERROR, "ARI ChannelHangupRequest missing required field application\n");
                res = 0;
        }
 
-       if (!has_duration_ms) {
-               ast_log(LOG_ERROR, "ARI ChannelDtmfReceived missing required field duration_ms\n");
+       if (!has_channel) {
+               ast_log(LOG_ERROR, "ARI ChannelHangupRequest missing required field channel\n");
                res = 0;
        }
 
        return res;
 }
 
-ari_validator ast_ari_validate_channel_dtmf_received_fn(void)
+ari_validator ast_ari_validate_channel_hangup_request_fn(void)
 {
-       return ast_ari_validate_channel_dtmf_received;
+       return ast_ari_validate_channel_hangup_request;
 }
 
-int ast_ari_validate_channel_entered_bridge(struct ast_json *json)
+int ast_ari_validate_channel_left_bridge(struct ast_json *json)
 {
        int res = 1;
        struct ast_json_iter *iter;
        int has_type = 0;
        int has_application = 0;
        int has_bridge = 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) {
@@ -2241,7 +2939,7 @@ int ast_ari_validate_channel_entered_bridge(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_string(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelEnteredBridge field type failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelLeftBridge field type failed validation\n");
                                res = 0;
                        }
                } else
@@ -2251,7 +2949,7 @@ int ast_ari_validate_channel_entered_bridge(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_string(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelEnteredBridge field application failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelLeftBridge field application failed validation\n");
                                res = 0;
                        }
                } else
@@ -2260,7 +2958,7 @@ int ast_ari_validate_channel_entered_bridge(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_date(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelEnteredBridge field timestamp failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelLeftBridge field timestamp failed validation\n");
                                res = 0;
                        }
                } else
@@ -2270,51 +2968,57 @@ int ast_ari_validate_channel_entered_bridge(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_bridge(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelEnteredBridge field bridge failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelLeftBridge field bridge 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 ChannelEnteredBridge field channel failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelLeftBridge field channel failed validation\n");
                                res = 0;
                        }
                } else
                {
                        ast_log(LOG_ERROR,
-                               "ARI ChannelEnteredBridge has undocumented field %s\n",
+                               "ARI ChannelLeftBridge has undocumented field %s\n",
                                ast_json_object_iter_key(iter));
                        res = 0;
                }
        }
 
        if (!has_type) {
-               ast_log(LOG_ERROR, "ARI ChannelEnteredBridge missing required field type\n");
+               ast_log(LOG_ERROR, "ARI ChannelLeftBridge missing required field type\n");
                res = 0;
        }
 
        if (!has_application) {
-               ast_log(LOG_ERROR, "ARI ChannelEnteredBridge missing required field application\n");
+               ast_log(LOG_ERROR, "ARI ChannelLeftBridge missing required field application\n");
                res = 0;
        }
 
        if (!has_bridge) {
-               ast_log(LOG_ERROR, "ARI ChannelEnteredBridge missing required field bridge\n");
+               ast_log(LOG_ERROR, "ARI ChannelLeftBridge missing required field bridge\n");
+               res = 0;
+       }
+
+       if (!has_channel) {
+               ast_log(LOG_ERROR, "ARI ChannelLeftBridge missing required field channel\n");
                res = 0;
        }
 
        return res;
 }
 
-ari_validator ast_ari_validate_channel_entered_bridge_fn(void)
+ari_validator ast_ari_validate_channel_left_bridge_fn(void)
 {
-       return ast_ari_validate_channel_entered_bridge;
+       return ast_ari_validate_channel_left_bridge;
 }
 
-int ast_ari_validate_channel_hangup_request(struct ast_json *json)
+int ast_ari_validate_channel_state_change(struct ast_json *json)
 {
        int res = 1;
        struct ast_json_iter *iter;
@@ -2329,7 +3033,7 @@ int ast_ari_validate_channel_hangup_request(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_string(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelHangupRequest field type failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelStateChange field type failed validation\n");
                                res = 0;
                        }
                } else
@@ -2339,7 +3043,7 @@ int ast_ari_validate_channel_hangup_request(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_string(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelHangupRequest field application failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelStateChange field application failed validation\n");
                                res = 0;
                        }
                } else
@@ -2348,16 +3052,7 @@ int ast_ari_validate_channel_hangup_request(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_date(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelHangupRequest field timestamp failed validation\n");
-                               res = 0;
-                       }
-               } else
-               if (strcmp("cause", ast_json_object_iter_key(iter)) == 0) {
-                       int prop_is_valid;
-                       prop_is_valid = ast_ari_validate_int(
-                               ast_json_object_iter_value(iter));
-                       if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelHangupRequest field cause failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelStateChange field timestamp failed validation\n");
                                res = 0;
                        }
                } else
@@ -2367,58 +3062,49 @@ int ast_ari_validate_channel_hangup_request(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_channel(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelHangupRequest field channel failed validation\n");
-                               res = 0;
-                       }
-               } else
-               if (strcmp("soft", ast_json_object_iter_key(iter)) == 0) {
-                       int prop_is_valid;
-                       prop_is_valid = ast_ari_validate_boolean(
-                               ast_json_object_iter_value(iter));
-                       if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelHangupRequest field soft failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelStateChange field channel failed validation\n");
                                res = 0;
                        }
                } else
                {
                        ast_log(LOG_ERROR,
-                               "ARI ChannelHangupRequest has undocumented field %s\n",
+                               "ARI ChannelStateChange has undocumented field %s\n",
                                ast_json_object_iter_key(iter));
                        res = 0;
                }
        }
 
        if (!has_type) {
-               ast_log(LOG_ERROR, "ARI ChannelHangupRequest missing required field type\n");
+               ast_log(LOG_ERROR, "ARI ChannelStateChange missing required field type\n");
                res = 0;
        }
 
        if (!has_application) {
-               ast_log(LOG_ERROR, "ARI ChannelHangupRequest missing required field application\n");
+               ast_log(LOG_ERROR, "ARI ChannelStateChange missing required field application\n");
                res = 0;
        }
 
        if (!has_channel) {
-               ast_log(LOG_ERROR, "ARI ChannelHangupRequest missing required field channel\n");
+               ast_log(LOG_ERROR, "ARI ChannelStateChange missing required field channel\n");
                res = 0;
        }
 
        return res;
 }
 
-ari_validator ast_ari_validate_channel_hangup_request_fn(void)
+ari_validator ast_ari_validate_channel_state_change_fn(void)
 {
-       return ast_ari_validate_channel_hangup_request;
+       return ast_ari_validate_channel_state_change;
 }
 
-int ast_ari_validate_channel_left_bridge(struct ast_json *json)
+int ast_ari_validate_channel_talking_finished(struct ast_json *json)
 {
        int res = 1;
        struct ast_json_iter *iter;
        int has_type = 0;
        int has_application = 0;
-       int has_bridge = 0;
        int has_channel = 0;
+       int has_duration = 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) {
@@ -2427,7 +3113,7 @@ int ast_ari_validate_channel_left_bridge(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_string(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelLeftBridge field type failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelTalkingFinished field type failed validation\n");
                                res = 0;
                        }
                } else
@@ -2437,7 +3123,7 @@ int ast_ari_validate_channel_left_bridge(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_string(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelLeftBridge field application failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelTalkingFinished field application failed validation\n");
                                res = 0;
                        }
                } else
@@ -2446,67 +3132,67 @@ int ast_ari_validate_channel_left_bridge(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_date(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelLeftBridge field timestamp failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelTalkingFinished field timestamp failed validation\n");
                                res = 0;
                        }
                } else
-               if (strcmp("bridge", ast_json_object_iter_key(iter)) == 0) {
+               if (strcmp("channel", ast_json_object_iter_key(iter)) == 0) {
                        int prop_is_valid;
-                       has_bridge = 1;
-                       prop_is_valid = ast_ari_validate_bridge(
+                       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 ChannelLeftBridge field bridge failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelTalkingFinished field channel failed validation\n");
                                res = 0;
                        }
                } else
-               if (strcmp("channel", ast_json_object_iter_key(iter)) == 0) {
+               if (strcmp("duration", ast_json_object_iter_key(iter)) == 0) {
                        int prop_is_valid;
-                       has_channel = 1;
-                       prop_is_valid = ast_ari_validate_channel(
+                       has_duration = 1;
+                       prop_is_valid = ast_ari_validate_int(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelLeftBridge field channel failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelTalkingFinished field duration failed validation\n");
                                res = 0;
                        }
                } else
                {
                        ast_log(LOG_ERROR,
-                               "ARI ChannelLeftBridge has undocumented field %s\n",
+                               "ARI ChannelTalkingFinished has undocumented field %s\n",
                                ast_json_object_iter_key(iter));
                        res = 0;
                }
        }
 
        if (!has_type) {
-               ast_log(LOG_ERROR, "ARI ChannelLeftBridge missing required field type\n");
+               ast_log(LOG_ERROR, "ARI ChannelTalkingFinished missing required field type\n");
                res = 0;
        }
 
        if (!has_application) {
-               ast_log(LOG_ERROR, "ARI ChannelLeftBridge missing required field application\n");
+               ast_log(LOG_ERROR, "ARI ChannelTalkingFinished missing required field application\n");
                res = 0;
        }
 
-       if (!has_bridge) {
-               ast_log(LOG_ERROR, "ARI ChannelLeftBridge missing required field bridge\n");
+       if (!has_channel) {
+               ast_log(LOG_ERROR, "ARI ChannelTalkingFinished missing required field channel\n");
                res = 0;
        }
 
-       if (!has_channel) {
-               ast_log(LOG_ERROR, "ARI ChannelLeftBridge missing required field channel\n");
+       if (!has_duration) {
+               ast_log(LOG_ERROR, "ARI ChannelTalkingFinished missing required field duration\n");
                res = 0;
        }
 
        return res;
 }
 
-ari_validator ast_ari_validate_channel_left_bridge_fn(void)
+ari_validator ast_ari_validate_channel_talking_finished_fn(void)
 {
-       return ast_ari_validate_channel_left_bridge;
+       return ast_ari_validate_channel_talking_finished;
 }
 
-int ast_ari_validate_channel_state_change(struct ast_json *json)
+int ast_ari_validate_channel_talking_started(struct ast_json *json)
 {
        int res = 1;
        struct ast_json_iter *iter;
@@ -2521,7 +3207,7 @@ int ast_ari_validate_channel_state_change(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_string(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelStateChange field type failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelTalkingStarted field type failed validation\n");
                                res = 0;
                        }
                } else
@@ -2531,7 +3217,7 @@ int ast_ari_validate_channel_state_change(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_string(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelStateChange field application failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelTalkingStarted field application failed validation\n");
                                res = 0;
                        }
                } else
@@ -2540,7 +3226,7 @@ int ast_ari_validate_channel_state_change(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_date(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelStateChange field timestamp failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelTalkingStarted field timestamp failed validation\n");
                                res = 0;
                        }
                } else
@@ -2550,39 +3236,39 @@ int ast_ari_validate_channel_state_change(struct ast_json *json)
                        prop_is_valid = ast_ari_validate_channel(
                                ast_json_object_iter_value(iter));
                        if (!prop_is_valid) {
-                               ast_log(LOG_ERROR, "ARI ChannelStateChange field channel failed validation\n");
+                               ast_log(LOG_ERROR, "ARI ChannelTalkingStarted field channel failed validation\n");
                                res = 0;
                        }
                } else
                {
                        ast_log(LOG_ERROR,
-                               "ARI ChannelStateChange has undocumented field %s\n",
+                               "ARI ChannelTalkingStarted has undocumented field %s\n",
                                ast_json_object_iter_key(iter));
                        res = 0;
                }
        }
 
        if (!has_type) {
-               ast_log(LOG_ERROR, "ARI ChannelStateChange missing required field type\n");
+               ast_log(LOG_ERROR, "ARI ChannelTalkingStarted missing required field type\n");
                res = 0;
        }
 
        if (!has_application) {
-               ast_log(LOG_ERROR, "ARI ChannelStateChange missing required field application\n");
+               ast_log(LOG_ERROR, "ARI ChannelTalkingStarted missing required field application\n");
                res = 0;
        }
 
        if (!has_channel) {
-               ast_log(LOG_ERROR, "ARI ChannelStateChange missing required field channel\n");
+               ast_log(LOG_ERROR, "ARI ChannelTalkingStarted missing required field channel\n");
                res = 0;
        }
 
        return res;
 }
 
-ari_validator ast_ari_validate_channel_state_change_fn(void)
+ari_validator ast_ari_validate_channel_talking_started_fn(void)
 {
-       return ast_ari_validate_channel_state_change;
+       return ast_ari_validate_channel_talking_started;
 }
 
 int ast_ari_validate_channel_userevent(struct ast_json *json)
@@ -2591,7 +3277,6 @@ int ast_ari_validate_channel_userevent(struct ast_json *json)
        struct ast_json_iter *iter;
        int has_type = 0;
        int has_application = 0;
-       int has_channel = 0;
        int has_eventname = 0;
        int has_userevent = 0;
 
@@ -2625,9 +3310,17 @@ int ast_ari_validate_channel_userevent(struct ast_json *json)
                                res = 0;
                        }
                } else
+               if (strcmp("bridge", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_bridge(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI ChannelUserevent field bridge 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) {
@@ -2635,6 +3328,15 @@ int ast_ari_validate_channel_userevent(struct ast_json *json)
                                res = 0;
                        }
                } else
+               if (strcmp("endpoint", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_endpoint(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI ChannelUserevent field endpoint failed validation\n");
+                               res = 0;
+                       }
+               } else
                if (strcmp("eventname", ast_json_object_iter_key(iter)) == 0) {
                        int prop_is_valid;
                        has_eventname = 1;
@@ -2673,11 +3375,6 @@ int ast_ari_validate_channel_userevent(struct ast_json *json)
                res = 0;
        }
 
-       if (!has_channel) {
-               ast_log(LOG_ERROR, "ARI ChannelUserevent missing required field channel\n");
-               res = 0;
-       }
-
        if (!has_eventname) {
                ast_log(LOG_ERROR, "ARI ChannelUserevent missing required field eventname\n");
                res = 0;
@@ -2879,6 +3576,137 @@ ari_validator ast_ari_validate_device_state_changed_fn(void)
        return ast_ari_validate_device_state_changed;
 }
 
+int ast_ari_validate_dial(struct ast_json *json)
+{
+       int res = 1;
+       struct ast_json_iter *iter;
+       int has_type = 0;
+       int has_application = 0;
+       int has_dialstatus = 0;
+       int has_peer = 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 Dial 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 Dial 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 Dial field timestamp failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("caller", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_channel(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI Dial field caller failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("dialstatus", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_dialstatus = 1;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI Dial field dialstatus failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("dialstring", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI Dial field dialstring failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("forward", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_string(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI Dial field forward failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("forwarded", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       prop_is_valid = ast_ari_validate_channel(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI Dial field forwarded failed validation\n");
+                               res = 0;
+                       }
+               } else
+               if (strcmp("peer", ast_json_object_iter_key(iter)) == 0) {
+                       int prop_is_valid;
+                       has_peer = 1;
+                       prop_is_valid = ast_ari_validate_channel(
+                               ast_json_object_iter_value(iter));
+                       if (!prop_is_valid) {
+                               ast_log(LOG_ERROR, "ARI Dial field peer failed validation\n");
+                               res = 0;
+                       }
+               } else
+               {
+                       ast_log(LOG_ERROR,
+                               "ARI Dial has undocumented field %s\n",
+                               ast_json_object_iter_key(iter));
+                       res = 0;
+               }
+       }
+
+       if (!has_type) {
+               ast_log(LOG_ERROR, "ARI Dial missing required field type\n");
+               res = 0;
+       }
+
+       if (!has_application) {
+               ast_log(LOG_ERROR, "ARI Dial missing required field application\n");
+               res = 0;
+       }
+
+       if (!has_dialstatus) {
+               ast_log(LOG_ERROR, "ARI Dial missing required field dialstatus\n");
+               res = 0;
+       }
+
+       if (!has_peer) {
+               ast_log(LOG_ERROR, "ARI Dial missing required field peer\n");
+               res = 0;
+       }
+
+       return res;
+}
+
+ari_validator ast_ari_validate_dial_fn(void)
+{
+       return ast_ari_validate_dial;
+}
+
 int ast_ari_validate_endpoint_state_change(struct ast_json *json)
 {
        int res = 1;
@@ -2978,6 +3806,12 @@ int ast_ari_validate_event(struct ast_json *json)
        if (strcmp("ApplicationReplaced", discriminator) == 0) {
                return ast_ari_validate_application_replaced(json);
        } else
+       if (strcmp("BridgeAttendedTransfer", discriminator) == 0) {
+               return ast_ari_validate_bridge_attended_transfer(json);
+       } else
+       if (strcmp("BridgeBlindTransfer", discriminator) == 0) {
+               return ast_ari_validate_bridge_blind_transfer(json);
+       } else
        if (strcmp("BridgeCreated", discriminator) == 0) {
                return ast_ari_validate_bridge_created(json);
        } else
@@ -3014,6 +3848,12 @@ int ast_ari_validate_event(struct ast_json *json)
        if (strcmp("ChannelStateChange", discriminator) == 0) {
                return ast_ari_validate_channel_state_change(json);
        } else
+       if (strcmp("ChannelTalkingFinished", discriminator) == 0) {
+               return ast_ari_validate_channel_talking_finished(json);
+       } else
+       if (strcmp("ChannelTalkingStarted", discriminator) == 0) {
+               return ast_ari_validate_channel_talking_started(json);
+       } else
        if (strcmp("ChannelUserevent", discriminator) == 0) {
                return ast_ari_validate_channel_userevent(json);
        } else
@@ -3023,6 +3863,9 @@ int ast_ari_validate_event(struct ast_json *json)
        if (strcmp("DeviceStateChanged", discriminator) == 0) {
                return ast_ari_validate_device_state_changed(json);
        } else
+       if (strcmp("Dial", discriminator) == 0) {
+               return ast_ari_validate_dial(json);
+       } else
        if (strcmp("EndpointStateChange", discriminator) == 0) {
                return ast_ari_validate_endpoint_state_change(json);
        } else
@@ -3128,6 +3971,12 @@ int ast_ari_validate_message(struct ast_json *json)
        if (strcmp("ApplicationReplaced", discriminator) == 0) {
                return ast_ari_validate_application_replaced(json);
        } else
+       if (strcmp("BridgeAttendedTransfer", discriminator) == 0) {
+               return ast_ari_validate_bridge_attended_transfer(json);
+       } else
+       if (strcmp("BridgeBlindTransfer", discriminator) == 0) {
+               return ast_ari_validate_bridge_blind_transfer(json);
+       } else
        if (strcmp("BridgeCreated", discriminator) == 0) {
                return ast_ari_validate_bridge_created(json);
        } else
@@ -3164,6 +4013,12 @@ int ast_ari_validate_message(struct ast_json *json)
        if (strcmp("ChannelStateChange", discriminator) == 0) {
                return ast_ari_validate_channel_state_change(json);
        } else
+       if (strcmp("ChannelTalkingFinished", discriminator) == 0) {
+               return ast_ari_validate_channel_talking_finished(json);
+       } else
+       if (strcmp("ChannelTalkingStarted", discriminator) == 0) {
+               return ast_ari_validate_channel_talking_started(json);
+       } else
        if (strcmp("ChannelUserevent", discriminator) == 0) {
                return ast_ari_validate_channel_userevent(json);
        } else
@@ -3173,6 +4028,9 @@ int ast_ari_validate_message(struct ast_json *json)
        if (strcmp("DeviceStateChanged", discriminator) == 0) {
                return ast_ari_validate_device_state_changed(json);
        } else
+       if (strcmp("Dial", discriminator) == 0) {
+               return ast_ari_validate_dial(json);
+       } else
        if (strcmp("EndpointStateChange", discriminator) == 0) {
                return ast_ari_validate_endpoint_state_change(json);
        } else