kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

ari: User better nicknames for ARI operations

Browse Source 
While working on building client libraries from the Swagger API, I
noticed a problem with the nicknames.

    channel.deleteChannel()
    channel.answerChannel()
    channel.muteChannel()

Etc. We put the object name in the nickname (since we were generating C
code), but it makes OO generators redundant.

This patch makes the nicknames more OO friendly. This resulted in a lot
of name changing within the res_ari_*.so modules, but not much else.

There were a couple of other fixed I made in the process.

 * When reversible operations (POST /hold, POST /unhold) were made more
   RESTful (POST /hold, DELETE /unhold), the path for the second operation
   was left in the API declaration. This worked, but really the two
   operations should have been on the same API.
 * The POST /unmute operation had still not been REST-ified.

Review: https://reviewboard.asterisk.org/r/2940/
........

Merged revisions 402528 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402529 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David M. Lee
2013-11-07 21:10:31 +00:00
parent cdfbc02df1
commit 7d0d1a1efb
41 changed files with 614 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/res_ari_events.c
View File

@@ -52,10 +52,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#define MAX_VALS 128
static void ast_ari_event_websocket_ws_cb(struct ast_websocket *ws_session,
static void ast_ari_events_event_websocket_ws_cb(struct ast_websocket *ws_session,
struct ast_variable *get_params, struct ast_variable *headers)
{
struct ast_event_websocket_args args = {};
struct ast_ari_events_event_websocket_args args = {};
RAII_VAR(struct ast_ari_response *, response, NULL, ast_free);
struct ast_variable *i;
RAII_VAR(struct ast_websocket *, s, ws_session, ast_websocket_unref);
@@ -125,7 +125,7 @@ static void ast_ari_event_websocket_ws_cb(struct ast_websocket *ws_session,
{}
}
ast_ari_websocket_event_websocket(session, headers, &args);
ast_ari_websocket_events_event_websocket(session, headers, &args);
fin: __attribute__((unused))
if (response && response->response_code != 0) {
@@ -167,7 +167,7 @@ static int load_module(void)
return AST_MODULE_LOAD_FAILURE;
}
res |= ast_websocket_server_add_protocol(events.ws_server,
"ari", ast_ari_event_websocket_ws_cb);
"ari", ast_ari_events_event_websocket_ws_cb);
stasis_app_ref();
res |= ast_ari_add_handler(&events);
return res;