diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-08-19 16:57:06 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-19 16:57:06 -0500 |
| commit | fcc49d760f68cc4e42e56397e3bcf0049ea288ac (patch) | |
| tree | 0c51d757a3bbd3fcbd0579cb3ba2f3d221f1ccb0 /include | |
| parent | 6b3e96e47951721111379965f6ffc358ead05b93 (diff) | |
| parent | 6f448f32fe9b7379e2630fab7b06205f901f2ded (diff) | |
Merge "res_ari: Add http prefix to generated docs" into 13
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/ari.h | 3 | ||||
| -rw-r--r-- | include/asterisk/http.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/asterisk/ari.h b/include/asterisk/ari.h index c3df46a2b..1c54a694b 100644 --- a/include/asterisk/ari.h +++ b/include/asterisk/ari.h @@ -144,10 +144,11 @@ void ast_ari_invoke(struct ast_tcptls_session_instance *ser, * for unit testing. * * \param uri Requested URI, relative to the docs path. + * \param prefix prefix that prefixes all http requests * \param headers HTTP headers. * \param[out] response RESTful HTTP response. */ -void ast_ari_get_docs(const char *uri, struct ast_variable *headers, struct ast_ari_response *response); +void ast_ari_get_docs(const char *uri, const char *prefix, struct ast_variable *headers, struct ast_ari_response *response); /*! \brief Abstraction for reading/writing JSON to a WebSocket */ struct ast_ari_websocket_session; diff --git a/include/asterisk/http.h b/include/asterisk/http.h index bb8973dce..d5f54cc65 100644 --- a/include/asterisk/http.h +++ b/include/asterisk/http.h @@ -101,6 +101,7 @@ struct ast_http_uri { AST_LIST_ENTRY(ast_http_uri) entry; const char *description; const char *uri; + const char *prefix; ast_http_callback callback; unsigned int has_subtree:1; /*! Structure is malloc'd */ |