diff options
author | Mark Michelson <mmichelson@digium.com> | 2015-07-13 15:15:47 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-07-13 15:15:47 -0500 |
commit | 3412b0f1ad58e3b3f0afa42d1067531e42eddb71 (patch) | |
tree | 9ae57fcafa10a1e71b542b9c8d81dbd0f47afdec /res/res_ari_asterisk.c | |
parent | c8555235195ed1deb37f5e27390b0ed4da329dc5 (diff) | |
parent | 6a764db3700b31847138fcbfc7d811b96f99aca2 (diff) |
Merge "ARI: Added new functionality to get information on a single module."
Diffstat (limited to 'res/res_ari_asterisk.c')
-rw-r--r-- | res/res_ari_asterisk.c | 74 |
1 files changed, 72 insertions, 2 deletions
diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c index fb4207aab..214bb2fea 100644 --- a/res/res_ari_asterisk.c +++ b/res/res_ari_asterisk.c @@ -260,6 +260,66 @@ static void ast_ari_asterisk_list_modules_cb( fin: __attribute__((unused)) return; } +/*! + * \brief Parameter parsing callback for /asterisk/modules/{moduleName}. + * \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_asterisk_get_module_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_ari_asterisk_get_module_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 = path_vars; i; i = i->next) { + if (strcmp(i->name, "moduleName") == 0) { + args.module_name = (i->value); + } else + {} + } + ast_ari_asterisk_get_module(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: /* Module could not be found in running modules. */ + case 409: /* Module information could not be retrieved. */ + is_valid = 1; + break; + default: + if (200 <= code && code <= 299) { + is_valid = ast_ari_validate_module( + response->message); + } else { + ast_log(LOG_ERROR, "Invalid error response %d for /asterisk/modules/{moduleName}\n", code); + is_valid = 0; + } + } + + if (!is_valid) { + ast_log(LOG_ERROR, "Response validation failed for /asterisk/modules/{moduleName}\n"); + ast_ari_response_error(response, 500, + "Internal Server Error", "Response validation failed"); + } +#endif /* AST_DEVMODE */ + +fin: __attribute__((unused)) + return; +} int ast_ari_asterisk_get_global_var_parse_body( struct ast_json *body, struct ast_ari_asterisk_get_global_var_args *args) @@ -460,13 +520,23 @@ static struct stasis_rest_handlers asterisk_info = { .children = { } }; /*! \brief REST handler for /api-docs/asterisk.{format} */ +static struct stasis_rest_handlers asterisk_modules_moduleName = { + .path_segment = "moduleName", + .is_wildcard = 1, + .callbacks = { + [AST_HTTP_GET] = ast_ari_asterisk_get_module_cb, + }, + .num_children = 0, + .children = { } +}; +/*! \brief REST handler for /api-docs/asterisk.{format} */ static struct stasis_rest_handlers asterisk_modules = { .path_segment = "modules", .callbacks = { [AST_HTTP_GET] = ast_ari_asterisk_list_modules_cb, }, - .num_children = 0, - .children = { } + .num_children = 1, + .children = { &asterisk_modules_moduleName, } }; /*! \brief REST handler for /api-docs/asterisk.{format} */ static struct stasis_rest_handlers asterisk_variable = { |