build: Update config.guess and config.sub
[asterisk/asterisk.git] / res / res_ari_bridges.c
index f72a728..7ef0f68 100644 (file)
 
 /*** MODULEINFO
        <depend type="module">res_ari</depend>
+       <depend type="module">res_ari_model</depend>
        <depend type="module">res_stasis</depend>
+       <depend type="module">res_stasis_recording</depend>
+       <depend type="module">res_stasis_playback</depend>
        <support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 #include "asterisk/stasis_app.h"
@@ -61,10 +62,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 static void ast_ari_bridges_list_cb(
        struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
-       struct ast_variable *headers, struct ast_ari_response *response)
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
 {
        struct ast_ari_bridges_list_args args = {};
-       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -102,6 +102,27 @@ static void ast_ari_bridges_list_cb(
 fin: __attribute__((unused))
        return;
 }
+int ast_ari_bridges_create_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_create_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "type");
+       if (field) {
+               args->type = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "bridgeId");
+       if (field) {
+               args->bridge_id = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "name");
+       if (field) {
+               args->name = ast_json_string_get(field);
+       }
+       return 0;
+}
+
 /*!
  * \brief Parameter parsing callback for /bridges.
  * \param get_params GET parameters in the HTTP request.
@@ -112,12 +133,10 @@ fin: __attribute__((unused))
 static void ast_ari_bridges_create_cb(
        struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
-       struct ast_variable *headers, struct ast_ari_response *response)
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
 {
        struct ast_ari_bridges_create_args args = {};
        struct ast_variable *i;
-       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
-       struct ast_json *field;
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -127,29 +146,106 @@ static void ast_ari_bridges_create_cb(
                if (strcmp(i->name, "type") == 0) {
                        args.type = (i->value);
                } else
+               if (strcmp(i->name, "bridgeId") == 0) {
+                       args.bridge_id = (i->value);
+               } else
+               if (strcmp(i->name, "name") == 0) {
+                       args.name = (i->value);
+               } else
                {}
        }
-       /* Look for a JSON request entity */
-       body = ast_http_get_json(ser, headers);
-       if (!body) {
-               switch (errno) {
-               case EFBIG:
-                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
-                       goto fin;
-               case ENOMEM:
-                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
-                       goto fin;
-               case EIO:
-                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
-                       goto fin;
+       if (ast_ari_bridges_create_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_create(headers, &args, response);
+#if defined(AST_DEVMODE)
+       code = response->response_code;
+
+       switch (code) {
+       case 0: /* Implementation is still a stub, or the code wasn't set */
+               is_valid = response->message == NULL;
+               break;
+       case 500: /* Internal Server Error */
+       case 501: /* Not Implemented */
+               is_valid = 1;
+               break;
+       default:
+               if (200 <= code && code <= 299) {
+                       is_valid = ast_ari_validate_bridge(
+                               response->message);
+               } else {
+                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges\n", code);
+                       is_valid = 0;
                }
        }
+
+       if (!is_valid) {
+               ast_log(LOG_ERROR, "Response validation failed for /bridges\n");
+               ast_ari_response_error(response, 500,
+                       "Internal Server Error", "Response validation failed");
+       }
+#endif /* AST_DEVMODE */
+
+fin: __attribute__((unused))
+       return;
+}
+int ast_ari_bridges_create_with_id_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_create_with_id_args *args)
+{
+       struct ast_json *field;
        /* Parse query parameters out of it */
        field = ast_json_object_get(body, "type");
        if (field) {
-               args.type = ast_json_string_get(field);
+               args->type = ast_json_string_get(field);
        }
-       ast_ari_bridges_create(headers, &args, response);
+       field = ast_json_object_get(body, "name");
+       if (field) {
+               args->name = ast_json_string_get(field);
+       }
+       return 0;
+}
+
+/*!
+ * \brief Parameter parsing callback for /bridges/{bridgeId}.
+ * \param get_params GET parameters in the HTTP request.
+ * \param path_vars Path variables extracted from the request.
+ * \param headers HTTP headers.
+ * \param[out] response Response to the HTTP request.
+ */
+static void ast_ari_bridges_create_with_id_cb(
+       struct ast_tcptls_session_instance *ser,
+       struct ast_variable *get_params, struct ast_variable *path_vars,
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
+{
+       struct ast_ari_bridges_create_with_id_args args = {};
+       struct ast_variable *i;
+#if defined(AST_DEVMODE)
+       int is_valid;
+       int code;
+#endif /* AST_DEVMODE */
+
+       for (i = get_params; i; i = i->next) {
+               if (strcmp(i->name, "type") == 0) {
+                       args.type = (i->value);
+               } else
+               if (strcmp(i->name, "name") == 0) {
+                       args.name = (i->value);
+               } else
+               {}
+       }
+       for (i = path_vars; i; i = i->next) {
+               if (strcmp(i->name, "bridgeId") == 0) {
+                       args.bridge_id = (i->value);
+               } else
+               {}
+       }
+       if (ast_ari_bridges_create_with_id_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_create_with_id(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -166,13 +262,13 @@ static void ast_ari_bridges_create_cb(
                        is_valid = ast_ari_validate_bridge(
                                response->message);
                } else {
-                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges\n", code);
+                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}\n", code);
                        is_valid = 0;
                }
        }
 
        if (!is_valid) {
-               ast_log(LOG_ERROR, "Response validation failed for /bridges\n");
+               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}\n");
                ast_ari_response_error(response, 500,
                        "Internal Server Error", "Response validation failed");
        }
@@ -191,11 +287,10 @@ fin: __attribute__((unused))
 static void ast_ari_bridges_get_cb(
        struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
-       struct ast_variable *headers, struct ast_ari_response *response)
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
 {
        struct ast_ari_bridges_get_args args = {};
        struct ast_variable *i;
-       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -250,11 +345,10 @@ fin: __attribute__((unused))
 static void ast_ari_bridges_destroy_cb(
        struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
-       struct ast_variable *headers, struct ast_ari_response *response)
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
 {
        struct ast_ari_bridges_destroy_args args = {};
        struct ast_variable *i;
-       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -299,6 +393,56 @@ static void ast_ari_bridges_destroy_cb(
 fin: __attribute__((unused))
        return;
 }
+int ast_ari_bridges_add_channel_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_add_channel_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "channel");
+       if (field) {
+               /* If they were silly enough to both pass in a query param and a
+                * JSON body, free up the query value.
+                */
+               ast_free(args->channel);
+               if (ast_json_typeof(field) == AST_JSON_ARRAY) {
+                       /* Multiple param passed as array */
+                       size_t i;
+                       args->channel_count = ast_json_array_size(field);
+                       args->channel = ast_malloc(sizeof(*args->channel) * args->channel_count);
+
+                       if (!args->channel) {
+                               return -1;
+                       }
+
+                       for (i = 0; i < args->channel_count; ++i) {
+                               args->channel[i] = ast_json_string_get(ast_json_array_get(field, i));
+                       }
+               } else {
+                       /* Multiple param passed as single value */
+                       args->channel_count = 1;
+                       args->channel = ast_malloc(sizeof(*args->channel) * args->channel_count);
+                       if (!args->channel) {
+                               return -1;
+                       }
+                       args->channel[0] = ast_json_string_get(field);
+               }
+       }
+       field = ast_json_object_get(body, "role");
+       if (field) {
+               args->role = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "absorbDTMF");
+       if (field) {
+               args->absorb_dtmf = ast_json_is_true(field);
+       }
+       field = ast_json_object_get(body, "mute");
+       if (field) {
+               args->mute = ast_json_is_true(field);
+       }
+       return 0;
+}
+
 /*!
  * \brief Parameter parsing callback for /bridges/{bridgeId}/addChannel.
  * \param get_params GET parameters in the HTTP request.
@@ -309,12 +453,10 @@ fin: __attribute__((unused))
 static void ast_ari_bridges_add_channel_cb(
        struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
-       struct ast_variable *headers, struct ast_ari_response *response)
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
 {
        struct ast_ari_bridges_add_channel_args args = {};
        struct ast_variable *i;
-       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
-       struct ast_json *field;
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -367,6 +509,12 @@ static void ast_ari_bridges_add_channel_cb(
                if (strcmp(i->name, "role") == 0) {
                        args.role = (i->value);
                } else
+               if (strcmp(i->name, "absorbDTMF") == 0) {
+                       args.absorb_dtmf = ast_true(i->value);
+               } else
+               if (strcmp(i->name, "mute") == 0) {
+                       args.mute = ast_true(i->value);
+               } else
                {}
        }
        for (i = path_vars; i; i = i->next) {
@@ -375,56 +523,9 @@ static void ast_ari_bridges_add_channel_cb(
                } else
                {}
        }
-       /* Look for a JSON request entity */
-       body = ast_http_get_json(ser, headers);
-       if (!body) {
-               switch (errno) {
-               case EFBIG:
-                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
-                       goto fin;
-               case ENOMEM:
-                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
-                       goto fin;
-               case EIO:
-                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
-                       goto fin;
-               }
-       }
-       /* Parse query parameters out of it */
-       field = ast_json_object_get(body, "channel");
-       if (field) {
-               /* If they were silly enough to both pass in a query param and a
-                * JSON body, free up the query value.
-                */
-               ast_free(args.channel);
-               if (ast_json_typeof(field) == AST_JSON_ARRAY) {
-                       /* Multiple param passed as array */
-                       size_t i;
-                       args.channel_count = ast_json_array_size(field);
-                       args.channel = ast_malloc(sizeof(*args.channel) * args.channel_count);
-
-                       if (!args.channel) {
-                               ast_ari_response_alloc_failed(response);
-                               goto fin;
-                       }
-
-                       for (i = 0; i < args.channel_count; ++i) {
-                               args.channel[i] = ast_json_string_get(ast_json_array_get(field, i));
-                       }
-               } else {
-                       /* Multiple param passed as single value */
-                       args.channel_count = 1;
-                       args.channel = ast_malloc(sizeof(*args.channel) * args.channel_count);
-                       if (!args.channel) {
-                               ast_ari_response_alloc_failed(response);
-                               goto fin;
-                       }
-                       args.channel[0] = ast_json_string_get(field);
-               }
-       }
-       field = ast_json_object_get(body, "role");
-       if (field) {
-               args.role = ast_json_string_get(field);
+       if (ast_ari_bridges_add_channel_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
        }
        ast_ari_bridges_add_channel(headers, &args, response);
 #if defined(AST_DEVMODE)
@@ -438,7 +539,7 @@ static void ast_ari_bridges_add_channel_cb(
        case 501: /* Not Implemented */
        case 400: /* Channel not found */
        case 404: /* Bridge not found */
-       case 409: /* Bridge not in Stasis application */
+       case 409: /* Bridge not in Stasis application; Channel currently recording */
        case 422: /* Channel not in Stasis application */
                is_valid = 1;
                break;
@@ -464,6 +565,44 @@ fin: __attribute__((unused))
        ast_free(args.channel);
        return;
 }
+int ast_ari_bridges_remove_channel_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_remove_channel_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "channel");
+       if (field) {
+               /* If they were silly enough to both pass in a query param and a
+                * JSON body, free up the query value.
+                */
+               ast_free(args->channel);
+               if (ast_json_typeof(field) == AST_JSON_ARRAY) {
+                       /* Multiple param passed as array */
+                       size_t i;
+                       args->channel_count = ast_json_array_size(field);
+                       args->channel = ast_malloc(sizeof(*args->channel) * args->channel_count);
+
+                       if (!args->channel) {
+                               return -1;
+                       }
+
+                       for (i = 0; i < args->channel_count; ++i) {
+                               args->channel[i] = ast_json_string_get(ast_json_array_get(field, i));
+                       }
+               } else {
+                       /* Multiple param passed as single value */
+                       args->channel_count = 1;
+                       args->channel = ast_malloc(sizeof(*args->channel) * args->channel_count);
+                       if (!args->channel) {
+                               return -1;
+                       }
+                       args->channel[0] = ast_json_string_get(field);
+               }
+       }
+       return 0;
+}
+
 /*!
  * \brief Parameter parsing callback for /bridges/{bridgeId}/removeChannel.
  * \param get_params GET parameters in the HTTP request.
@@ -474,12 +613,10 @@ fin: __attribute__((unused))
 static void ast_ari_bridges_remove_channel_cb(
        struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
-       struct ast_variable *headers, struct ast_ari_response *response)
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
 {
        struct ast_ari_bridges_remove_channel_args args = {};
        struct ast_variable *i;
-       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
-       struct ast_json *field;
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -537,52 +674,9 @@ static void ast_ari_bridges_remove_channel_cb(
                } else
                {}
        }
-       /* Look for a JSON request entity */
-       body = ast_http_get_json(ser, headers);
-       if (!body) {
-               switch (errno) {
-               case EFBIG:
-                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
-                       goto fin;
-               case ENOMEM:
-                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
-                       goto fin;
-               case EIO:
-                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
-                       goto fin;
-               }
-       }
-       /* Parse query parameters out of it */
-       field = ast_json_object_get(body, "channel");
-       if (field) {
-               /* If they were silly enough to both pass in a query param and a
-                * JSON body, free up the query value.
-                */
-               ast_free(args.channel);
-               if (ast_json_typeof(field) == AST_JSON_ARRAY) {
-                       /* Multiple param passed as array */
-                       size_t i;
-                       args.channel_count = ast_json_array_size(field);
-                       args.channel = ast_malloc(sizeof(*args.channel) * args.channel_count);
-
-                       if (!args.channel) {
-                               ast_ari_response_alloc_failed(response);
-                               goto fin;
-                       }
-
-                       for (i = 0; i < args.channel_count; ++i) {
-                               args.channel[i] = ast_json_string_get(ast_json_array_get(field, i));
-                       }
-               } else {
-                       /* Multiple param passed as single value */
-                       args.channel_count = 1;
-                       args.channel = ast_malloc(sizeof(*args.channel) * args.channel_count);
-                       if (!args.channel) {
-                               ast_ari_response_alloc_failed(response);
-                               goto fin;
-                       }
-                       args.channel[0] = ast_json_string_get(field);
-               }
+       if (ast_ari_bridges_remove_channel_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
        }
        ast_ari_bridges_remove_channel(headers, &args, response);
 #if defined(AST_DEVMODE)
@@ -623,59 +717,34 @@ fin: __attribute__((unused))
        return;
 }
 /*!
- * \brief Parameter parsing callback for /bridges/{bridgeId}/moh.
+ * \brief Parameter parsing callback for /bridges/{bridgeId}/videoSource/{channelId}.
  * \param get_params GET parameters in the HTTP request.
  * \param path_vars Path variables extracted from the request.
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_bridges_start_moh_cb(
+static void ast_ari_bridges_set_video_source_cb(
        struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
-       struct ast_variable *headers, struct ast_ari_response *response)
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
 {
-       struct ast_ari_bridges_start_moh_args args = {};
+       struct ast_ari_bridges_set_video_source_args args = {};
        struct ast_variable *i;
-       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
-       struct ast_json *field;
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
 #endif /* AST_DEVMODE */
 
-       for (i = get_params; i; i = i->next) {
-               if (strcmp(i->name, "mohClass") == 0) {
-                       args.moh_class = (i->value);
-               } else
-               {}
-       }
        for (i = path_vars; i; i = i->next) {
                if (strcmp(i->name, "bridgeId") == 0) {
                        args.bridge_id = (i->value);
                } else
+               if (strcmp(i->name, "channelId") == 0) {
+                       args.channel_id = (i->value);
+               } else
                {}
        }
-       /* Look for a JSON request entity */
-       body = ast_http_get_json(ser, headers);
-       if (!body) {
-               switch (errno) {
-               case EFBIG:
-                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
-                       goto fin;
-               case ENOMEM:
-                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
-                       goto fin;
-               case EIO:
-                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
-                       goto fin;
-               }
-       }
-       /* Parse query parameters out of it */
-       field = ast_json_object_get(body, "mohClass");
-       if (field) {
-               args.moh_class = ast_json_string_get(field);
-       }
-       ast_ari_bridges_start_moh(headers, &args, response);
+       ast_ari_bridges_set_video_source(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -685,8 +754,9 @@ static void ast_ari_bridges_start_moh_cb(
                break;
        case 500: /* Internal Server Error */
        case 501: /* Not Implemented */
-       case 404: /* Bridge not found */
-       case 409: /* Bridge not in Stasis application */
+       case 404: /* Bridge or Channel not found */
+       case 409: /* Channel not in Stasis application */
+       case 422: /* Channel not in this Bridge */
                is_valid = 1;
                break;
        default:
@@ -694,13 +764,13 @@ static void ast_ari_bridges_start_moh_cb(
                        is_valid = ast_ari_validate_void(
                                response->message);
                } else {
-                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/moh\n", code);
+                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/videoSource/{channelId}\n", code);
                        is_valid = 0;
                }
        }
 
        if (!is_valid) {
-               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/moh\n");
+               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/videoSource/{channelId}\n");
                ast_ari_response_error(response, 500,
                        "Internal Server Error", "Response validation failed");
        }
@@ -710,20 +780,19 @@ fin: __attribute__((unused))
        return;
 }
 /*!
- * \brief Parameter parsing callback for /bridges/{bridgeId}/moh.
+ * \brief Parameter parsing callback for /bridges/{bridgeId}/videoSource.
  * \param get_params GET parameters in the HTTP request.
  * \param path_vars Path variables extracted from the request.
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_bridges_stop_moh_cb(
+static void ast_ari_bridges_clear_video_source_cb(
        struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
-       struct ast_variable *headers, struct ast_ari_response *response)
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
 {
-       struct ast_ari_bridges_stop_moh_args args = {};
+       struct ast_ari_bridges_clear_video_source_args args = {};
        struct ast_variable *i;
-       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -735,7 +804,7 @@ static void ast_ari_bridges_stop_moh_cb(
                } else
                {}
        }
-       ast_ari_bridges_stop_moh(headers, &args, response);
+       ast_ari_bridges_clear_video_source(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -746,7 +815,6 @@ static void ast_ari_bridges_stop_moh_cb(
        case 500: /* Internal Server Error */
        case 501: /* Not Implemented */
        case 404: /* Bridge not found */
-       case 409: /* Bridge not in Stasis application */
                is_valid = 1;
                break;
        default:
@@ -754,13 +822,13 @@ static void ast_ari_bridges_stop_moh_cb(
                        is_valid = ast_ari_validate_void(
                                response->message);
                } else {
-                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/moh\n", code);
+                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/videoSource\n", code);
                        is_valid = 0;
                }
        }
 
        if (!is_valid) {
-               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/moh\n");
+               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/videoSource\n");
                ast_ari_response_error(response, 500,
                        "Internal Server Error", "Response validation failed");
        }
@@ -769,22 +837,215 @@ static void ast_ari_bridges_stop_moh_cb(
 fin: __attribute__((unused))
        return;
 }
+int ast_ari_bridges_start_moh_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_start_moh_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "mohClass");
+       if (field) {
+               args->moh_class = ast_json_string_get(field);
+       }
+       return 0;
+}
+
 /*!
- * \brief Parameter parsing callback for /bridges/{bridgeId}/play.
+ * \brief Parameter parsing callback for /bridges/{bridgeId}/moh.
  * \param get_params GET parameters in the HTTP request.
  * \param path_vars Path variables extracted from the request.
  * \param headers HTTP headers.
  * \param[out] response Response to the HTTP request.
  */
-static void ast_ari_bridges_play_cb(
+static void ast_ari_bridges_start_moh_cb(
        struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
-       struct ast_variable *headers, struct ast_ari_response *response)
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
 {
-       struct ast_ari_bridges_play_args args = {};
+       struct ast_ari_bridges_start_moh_args args = {};
        struct ast_variable *i;
-       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
+#if defined(AST_DEVMODE)
+       int is_valid;
+       int code;
+#endif /* AST_DEVMODE */
+
+       for (i = get_params; i; i = i->next) {
+               if (strcmp(i->name, "mohClass") == 0) {
+                       args.moh_class = (i->value);
+               } else
+               {}
+       }
+       for (i = path_vars; i; i = i->next) {
+               if (strcmp(i->name, "bridgeId") == 0) {
+                       args.bridge_id = (i->value);
+               } else
+               {}
+       }
+       if (ast_ari_bridges_start_moh_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_start_moh(headers, &args, response);
+#if defined(AST_DEVMODE)
+       code = response->response_code;
+
+       switch (code) {
+       case 0: /* Implementation is still a stub, or the code wasn't set */
+               is_valid = response->message == NULL;
+               break;
+       case 500: /* Internal Server Error */
+       case 501: /* Not Implemented */
+       case 404: /* Bridge not found */
+       case 409: /* Bridge not in Stasis application */
+               is_valid = 1;
+               break;
+       default:
+               if (200 <= code && code <= 299) {
+                       is_valid = ast_ari_validate_void(
+                               response->message);
+               } else {
+                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/moh\n", code);
+                       is_valid = 0;
+               }
+       }
+
+       if (!is_valid) {
+               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/moh\n");
+               ast_ari_response_error(response, 500,
+                       "Internal Server Error", "Response validation failed");
+       }
+#endif /* AST_DEVMODE */
+
+fin: __attribute__((unused))
+       return;
+}
+/*!
+ * \brief Parameter parsing callback for /bridges/{bridgeId}/moh.
+ * \param get_params GET parameters in the HTTP request.
+ * \param path_vars Path variables extracted from the request.
+ * \param headers HTTP headers.
+ * \param[out] response Response to the HTTP request.
+ */
+static void ast_ari_bridges_stop_moh_cb(
+       struct ast_tcptls_session_instance *ser,
+       struct ast_variable *get_params, struct ast_variable *path_vars,
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
+{
+       struct ast_ari_bridges_stop_moh_args args = {};
+       struct ast_variable *i;
+#if defined(AST_DEVMODE)
+       int is_valid;
+       int code;
+#endif /* AST_DEVMODE */
+
+       for (i = path_vars; i; i = i->next) {
+               if (strcmp(i->name, "bridgeId") == 0) {
+                       args.bridge_id = (i->value);
+               } else
+               {}
+       }
+       ast_ari_bridges_stop_moh(headers, &args, response);
+#if defined(AST_DEVMODE)
+       code = response->response_code;
+
+       switch (code) {
+       case 0: /* Implementation is still a stub, or the code wasn't set */
+               is_valid = response->message == NULL;
+               break;
+       case 500: /* Internal Server Error */
+       case 501: /* Not Implemented */
+       case 404: /* Bridge not found */
+       case 409: /* Bridge not in Stasis application */
+               is_valid = 1;
+               break;
+       default:
+               if (200 <= code && code <= 299) {
+                       is_valid = ast_ari_validate_void(
+                               response->message);
+               } else {
+                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/moh\n", code);
+                       is_valid = 0;
+               }
+       }
+
+       if (!is_valid) {
+               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/moh\n");
+               ast_ari_response_error(response, 500,
+                       "Internal Server Error", "Response validation failed");
+       }
+#endif /* AST_DEVMODE */
+
+fin: __attribute__((unused))
+       return;
+}
+int ast_ari_bridges_play_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_play_args *args)
+{
        struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "media");
+       if (field) {
+               /* If they were silly enough to both pass in a query param and a
+                * JSON body, free up the query value.
+                */
+               ast_free(args->media);
+               if (ast_json_typeof(field) == AST_JSON_ARRAY) {
+                       /* Multiple param passed as array */
+                       size_t i;
+                       args->media_count = ast_json_array_size(field);
+                       args->media = ast_malloc(sizeof(*args->media) * args->media_count);
+
+                       if (!args->media) {
+                               return -1;
+                       }
+
+                       for (i = 0; i < args->media_count; ++i) {
+                               args->media[i] = ast_json_string_get(ast_json_array_get(field, i));
+                       }
+               } else {
+                       /* Multiple param passed as single value */
+                       args->media_count = 1;
+                       args->media = ast_malloc(sizeof(*args->media) * args->media_count);
+                       if (!args->media) {
+                               return -1;
+                       }
+                       args->media[0] = ast_json_string_get(field);
+               }
+       }
+       field = ast_json_object_get(body, "lang");
+       if (field) {
+               args->lang = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "offsetms");
+       if (field) {
+               args->offsetms = ast_json_integer_get(field);
+       }
+       field = ast_json_object_get(body, "skipms");
+       if (field) {
+               args->skipms = ast_json_integer_get(field);
+       }
+       field = ast_json_object_get(body, "playbackId");
+       if (field) {
+               args->playback_id = ast_json_string_get(field);
+       }
+       return 0;
+}
+
+/*!
+ * \brief Parameter parsing callback for /bridges/{bridgeId}/play.
+ * \param get_params GET parameters in the HTTP request.
+ * \param path_vars Path variables extracted from the request.
+ * \param headers HTTP headers.
+ * \param[out] response Response to the HTTP request.
+ */
+static void ast_ari_bridges_play_cb(
+       struct ast_tcptls_session_instance *ser,
+       struct ast_variable *get_params, struct ast_variable *path_vars,
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
+{
+       struct ast_ari_bridges_play_args args = {};
+       struct ast_variable *i;
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -792,7 +1053,47 @@ static void ast_ari_bridges_play_cb(
 
        for (i = get_params; i; i = i->next) {
                if (strcmp(i->name, "media") == 0) {
-                       args.media = (i->value);
+                       /* Parse comma separated list */
+                       char *vals[MAX_VALS];
+                       size_t j;
+
+                       args.media_parse = ast_strdup(i->value);
+                       if (!args.media_parse) {
+                               ast_ari_response_alloc_failed(response);
+                               goto fin;
+                       }
+
+                       if (strlen(args.media_parse) == 0) {
+                               /* ast_app_separate_args can't handle "" */
+                               args.media_count = 1;
+                               vals[0] = args.media_parse;
+                       } else {
+                               args.media_count = ast_app_separate_args(
+                                       args.media_parse, ',', vals,
+                                       ARRAY_LEN(vals));
+                       }
+
+                       if (args.media_count == 0) {
+                               ast_ari_response_alloc_failed(response);
+                               goto fin;
+                       }
+
+                       if (args.media_count >= MAX_VALS) {
+                               ast_ari_response_error(response, 400,
+                                       "Bad Request",
+                                       "Too many values for media");
+                               goto fin;
+                       }
+
+                       args.media = ast_malloc(sizeof(*args.media) * args.media_count);
+                       if (!args.media) {
+                               ast_ari_response_alloc_failed(response);
+                               goto fin;
+                       }
+
+                       for (j = 0; j < args.media_count; ++j) {
+                               args.media[j] = (vals[j]);
+                       }
                } else
                if (strcmp(i->name, "lang") == 0) {
                        args.lang = (i->value);
@@ -803,6 +1104,9 @@ static void ast_ari_bridges_play_cb(
                if (strcmp(i->name, "skipms") == 0) {
                        args.skipms = atoi(i->value);
                } else
+               if (strcmp(i->name, "playbackId") == 0) {
+                       args.playback_id = (i->value);
+               } else
                {}
        }
        for (i = path_vars; i; i = i->next) {
@@ -811,39 +1115,184 @@ static void ast_ari_bridges_play_cb(
                } else
                {}
        }
-       /* Look for a JSON request entity */
-       body = ast_http_get_json(ser, headers);
-       if (!body) {
-               switch (errno) {
-               case EFBIG:
-                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
-                       goto fin;
-               case ENOMEM:
-                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
-                       goto fin;
-               case EIO:
-                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
-                       goto fin;
+       if (ast_ari_bridges_play_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_play(headers, &args, response);
+#if defined(AST_DEVMODE)
+       code = response->response_code;
+
+       switch (code) {
+       case 0: /* Implementation is still a stub, or the code wasn't set */
+               is_valid = response->message == NULL;
+               break;
+       case 500: /* Internal Server Error */
+       case 501: /* Not Implemented */
+       case 404: /* Bridge not found */
+       case 409: /* Bridge not in a Stasis application */
+               is_valid = 1;
+               break;
+       default:
+               if (200 <= code && code <= 299) {
+                       is_valid = ast_ari_validate_playback(
+                               response->message);
+               } else {
+                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/play\n", code);
+                       is_valid = 0;
                }
        }
+
+       if (!is_valid) {
+               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/play\n");
+               ast_ari_response_error(response, 500,
+                       "Internal Server Error", "Response validation failed");
+       }
+#endif /* AST_DEVMODE */
+
+fin: __attribute__((unused))
+       ast_free(args.media_parse);
+       ast_free(args.media);
+       return;
+}
+int ast_ari_bridges_play_with_id_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_play_with_id_args *args)
+{
+       struct ast_json *field;
        /* Parse query parameters out of it */
        field = ast_json_object_get(body, "media");
        if (field) {
-               args.media = ast_json_string_get(field);
+               /* If they were silly enough to both pass in a query param and a
+                * JSON body, free up the query value.
+                */
+               ast_free(args->media);
+               if (ast_json_typeof(field) == AST_JSON_ARRAY) {
+                       /* Multiple param passed as array */
+                       size_t i;
+                       args->media_count = ast_json_array_size(field);
+                       args->media = ast_malloc(sizeof(*args->media) * args->media_count);
+
+                       if (!args->media) {
+                               return -1;
+                       }
+
+                       for (i = 0; i < args->media_count; ++i) {
+                               args->media[i] = ast_json_string_get(ast_json_array_get(field, i));
+                       }
+               } else {
+                       /* Multiple param passed as single value */
+                       args->media_count = 1;
+                       args->media = ast_malloc(sizeof(*args->media) * args->media_count);
+                       if (!args->media) {
+                               return -1;
+                       }
+                       args->media[0] = ast_json_string_get(field);
+               }
        }
        field = ast_json_object_get(body, "lang");
        if (field) {
-               args.lang = ast_json_string_get(field);
+               args->lang = ast_json_string_get(field);
        }
        field = ast_json_object_get(body, "offsetms");
        if (field) {
-               args.offsetms = ast_json_integer_get(field);
+               args->offsetms = ast_json_integer_get(field);
        }
        field = ast_json_object_get(body, "skipms");
        if (field) {
-               args.skipms = ast_json_integer_get(field);
+               args->skipms = ast_json_integer_get(field);
        }
-       ast_ari_bridges_play(headers, &args, response);
+       return 0;
+}
+
+/*!
+ * \brief Parameter parsing callback for /bridges/{bridgeId}/play/{playbackId}.
+ * \param get_params GET parameters in the HTTP request.
+ * \param path_vars Path variables extracted from the request.
+ * \param headers HTTP headers.
+ * \param[out] response Response to the HTTP request.
+ */
+static void ast_ari_bridges_play_with_id_cb(
+       struct ast_tcptls_session_instance *ser,
+       struct ast_variable *get_params, struct ast_variable *path_vars,
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
+{
+       struct ast_ari_bridges_play_with_id_args args = {};
+       struct ast_variable *i;
+#if defined(AST_DEVMODE)
+       int is_valid;
+       int code;
+#endif /* AST_DEVMODE */
+
+       for (i = get_params; i; i = i->next) {
+               if (strcmp(i->name, "media") == 0) {
+                       /* Parse comma separated list */
+                       char *vals[MAX_VALS];
+                       size_t j;
+
+                       args.media_parse = ast_strdup(i->value);
+                       if (!args.media_parse) {
+                               ast_ari_response_alloc_failed(response);
+                               goto fin;
+                       }
+
+                       if (strlen(args.media_parse) == 0) {
+                               /* ast_app_separate_args can't handle "" */
+                               args.media_count = 1;
+                               vals[0] = args.media_parse;
+                       } else {
+                               args.media_count = ast_app_separate_args(
+                                       args.media_parse, ',', vals,
+                                       ARRAY_LEN(vals));
+                       }
+
+                       if (args.media_count == 0) {
+                               ast_ari_response_alloc_failed(response);
+                               goto fin;
+                       }
+
+                       if (args.media_count >= MAX_VALS) {
+                               ast_ari_response_error(response, 400,
+                                       "Bad Request",
+                                       "Too many values for media");
+                               goto fin;
+                       }
+
+                       args.media = ast_malloc(sizeof(*args.media) * args.media_count);
+                       if (!args.media) {
+                               ast_ari_response_alloc_failed(response);
+                               goto fin;
+                       }
+
+                       for (j = 0; j < args.media_count; ++j) {
+                               args.media[j] = (vals[j]);
+                       }
+               } else
+               if (strcmp(i->name, "lang") == 0) {
+                       args.lang = (i->value);
+               } else
+               if (strcmp(i->name, "offsetms") == 0) {
+                       args.offsetms = atoi(i->value);
+               } else
+               if (strcmp(i->name, "skipms") == 0) {
+                       args.skipms = atoi(i->value);
+               } else
+               {}
+       }
+       for (i = path_vars; i; i = i->next) {
+               if (strcmp(i->name, "bridgeId") == 0) {
+                       args.bridge_id = (i->value);
+               } else
+               if (strcmp(i->name, "playbackId") == 0) {
+                       args.playback_id = (i->value);
+               } else
+               {}
+       }
+       if (ast_ari_bridges_play_with_id_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
+       }
+       ast_ari_bridges_play_with_id(headers, &args, response);
 #if defined(AST_DEVMODE)
        code = response->response_code;
 
@@ -862,21 +1311,60 @@ static void ast_ari_bridges_play_cb(
                        is_valid = ast_ari_validate_playback(
                                response->message);
                } else {
-                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/play\n", code);
+                       ast_log(LOG_ERROR, "Invalid error response %d for /bridges/{bridgeId}/play/{playbackId}\n", code);
                        is_valid = 0;
                }
        }
 
        if (!is_valid) {
-               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/play\n");
+               ast_log(LOG_ERROR, "Response validation failed for /bridges/{bridgeId}/play/{playbackId}\n");
                ast_ari_response_error(response, 500,
                        "Internal Server Error", "Response validation failed");
        }
 #endif /* AST_DEVMODE */
 
 fin: __attribute__((unused))
+       ast_free(args.media_parse);
+       ast_free(args.media);
        return;
 }
+int ast_ari_bridges_record_parse_body(
+       struct ast_json *body,
+       struct ast_ari_bridges_record_args *args)
+{
+       struct ast_json *field;
+       /* Parse query parameters out of it */
+       field = ast_json_object_get(body, "name");
+       if (field) {
+               args->name = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "format");
+       if (field) {
+               args->format = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "maxDurationSeconds");
+       if (field) {
+               args->max_duration_seconds = ast_json_integer_get(field);
+       }
+       field = ast_json_object_get(body, "maxSilenceSeconds");
+       if (field) {
+               args->max_silence_seconds = ast_json_integer_get(field);
+       }
+       field = ast_json_object_get(body, "ifExists");
+       if (field) {
+               args->if_exists = ast_json_string_get(field);
+       }
+       field = ast_json_object_get(body, "beep");
+       if (field) {
+               args->beep = ast_json_is_true(field);
+       }
+       field = ast_json_object_get(body, "terminateOn");
+       if (field) {
+               args->terminate_on = ast_json_string_get(field);
+       }
+       return 0;
+}
+
 /*!
  * \brief Parameter parsing callback for /bridges/{bridgeId}/record.
  * \param get_params GET parameters in the HTTP request.
@@ -887,12 +1375,10 @@ fin: __attribute__((unused))
 static void ast_ari_bridges_record_cb(
        struct ast_tcptls_session_instance *ser,
        struct ast_variable *get_params, struct ast_variable *path_vars,
-       struct ast_variable *headers, struct ast_ari_response *response)
+       struct ast_variable *headers, struct ast_json *body, struct ast_ari_response *response)
 {
        struct ast_ari_bridges_record_args args = {};
        struct ast_variable *i;
-       RAII_VAR(struct ast_json *, body, NULL, ast_json_unref);
-       struct ast_json *field;
 #if defined(AST_DEVMODE)
        int is_valid;
        int code;
@@ -928,49 +1414,9 @@ static void ast_ari_bridges_record_cb(
                } else
                {}
        }
-       /* Look for a JSON request entity */
-       body = ast_http_get_json(ser, headers);
-       if (!body) {
-               switch (errno) {
-               case EFBIG:
-                       ast_ari_response_error(response, 413, "Request Entity Too Large", "Request body too large");
-                       goto fin;
-               case ENOMEM:
-                       ast_ari_response_error(response, 500, "Internal Server Error", "Error processing request");
-                       goto fin;
-               case EIO:
-                       ast_ari_response_error(response, 400, "Bad Request", "Error parsing request body");
-                       goto fin;
-               }
-       }
-       /* Parse query parameters out of it */
-       field = ast_json_object_get(body, "name");
-       if (field) {
-               args.name = ast_json_string_get(field);
-       }
-       field = ast_json_object_get(body, "format");
-       if (field) {
-               args.format = ast_json_string_get(field);
-       }
-       field = ast_json_object_get(body, "maxDurationSeconds");
-       if (field) {
-               args.max_duration_seconds = ast_json_integer_get(field);
-       }
-       field = ast_json_object_get(body, "maxSilenceSeconds");
-       if (field) {
-               args.max_silence_seconds = ast_json_integer_get(field);
-       }
-       field = ast_json_object_get(body, "ifExists");
-       if (field) {
-               args.if_exists = ast_json_string_get(field);
-       }
-       field = ast_json_object_get(body, "beep");
-       if (field) {
-               args.beep = ast_json_is_true(field);
-       }
-       field = ast_json_object_get(body, "terminateOn");
-       if (field) {
-               args.terminate_on = ast_json_string_get(field);
+       if (ast_ari_bridges_record_parse_body(body, &args)) {
+               ast_ari_response_alloc_failed(response);
+               goto fin;
        }
        ast_ari_bridges_record(headers, &args, response);
 #if defined(AST_DEVMODE)
@@ -1009,7 +1455,7 @@ fin: __attribute__((unused))
        return;
 }
 
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId_addChannel = {
        .path_segment = "addChannel",
        .callbacks = {
@@ -1018,7 +1464,7 @@ static struct stasis_rest_handlers bridges_bridgeId_addChannel = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId_removeChannel = {
        .path_segment = "removeChannel",
        .callbacks = {
@@ -1027,7 +1473,26 @@ static struct stasis_rest_handlers bridges_bridgeId_removeChannel = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
+static struct stasis_rest_handlers bridges_bridgeId_videoSource_channelId = {
+       .path_segment = "channelId",
+       .is_wildcard = 1,
+       .callbacks = {
+               [AST_HTTP_POST] = ast_ari_bridges_set_video_source_cb,
+       },
+       .num_children = 0,
+       .children = {  }
+};
+/*! \brief REST handler for /api-docs/bridges.json */
+static struct stasis_rest_handlers bridges_bridgeId_videoSource = {
+       .path_segment = "videoSource",
+       .callbacks = {
+               [AST_HTTP_DELETE] = ast_ari_bridges_clear_video_source_cb,
+       },
+       .num_children = 1,
+       .children = { &bridges_bridgeId_videoSource_channelId, }
+};
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId_moh = {
        .path_segment = "moh",
        .callbacks = {
@@ -1037,16 +1502,26 @@ static struct stasis_rest_handlers bridges_bridgeId_moh = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
+static struct stasis_rest_handlers bridges_bridgeId_play_playbackId = {
+       .path_segment = "playbackId",
+       .is_wildcard = 1,
+       .callbacks = {
+               [AST_HTTP_POST] = ast_ari_bridges_play_with_id_cb,
+       },
+       .num_children = 0,
+       .children = {  }
+};
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId_play = {
        .path_segment = "play",
        .callbacks = {
                [AST_HTTP_POST] = ast_ari_bridges_play_cb,
        },
-       .num_children = 0,
-       .children = {  }
+       .num_children = 1,
+       .children = { &bridges_bridgeId_play_playbackId, }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId_record = {
        .path_segment = "record",
        .callbacks = {
@@ -1055,18 +1530,19 @@ static struct stasis_rest_handlers bridges_bridgeId_record = {
        .num_children = 0,
        .children = {  }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges_bridgeId = {
        .path_segment = "bridgeId",
        .is_wildcard = 1,
        .callbacks = {
+               [AST_HTTP_POST] = ast_ari_bridges_create_with_id_cb,
                [AST_HTTP_GET] = ast_ari_bridges_get_cb,
                [AST_HTTP_DELETE] = ast_ari_bridges_destroy_cb,
        },
-       .num_children = 5,
-       .children = { &bridges_bridgeId_addChannel,&bridges_bridgeId_removeChannel,&bridges_bridgeId_moh,&bridges_bridgeId_play,&bridges_bridgeId_record, }
+       .num_children = 6,
+       .children = { &bridges_bridgeId_addChannel,&bridges_bridgeId_removeChannel,&bridges_bridgeId_videoSource,&bridges_bridgeId_moh,&bridges_bridgeId_play,&bridges_bridgeId_record, }
 };
-/*! \brief REST handler for /api-docs/bridges.{format} */
+/*! \brief REST handler for /api-docs/bridges.json */
 static struct stasis_rest_handlers bridges = {
        .path_segment = "bridges",
        .callbacks = {
@@ -1077,23 +1553,29 @@ static struct stasis_rest_handlers bridges = {
        .children = { &bridges_bridgeId, }
 };
 
+static int unload_module(void)
+{
+       ast_ari_remove_handler(&bridges);
+       return 0;
+}
+
 static int load_module(void)
 {
        int res = 0;
-       stasis_app_ref();
+
+
        res |= ast_ari_add_handler(&bridges);
-       return res;
-}
+       if (res) {
+               unload_module();
+               return AST_MODULE_LOAD_DECLINE;
+       }
 
-static int unload_module(void)
-{
-       ast_ari_remove_handler(&bridges);
-       stasis_app_unref();
-       return 0;
+       return AST_MODULE_LOAD_SUCCESS;
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Bridge resources",
+       .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
-       );
+       .requires = "res_ari,res_ari_model,res_stasis,res_stasis_recording,res_stasis_playback",
+);