[asterisk-commits] dlee: branch dlee/ari-url-shuffle r391585 - in /team/dlee/ari-url-shuffle: re...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jun 12 17:17:18 CDT 2013
Author: dlee
Date: Wed Jun 12 17:17:16 2013
New Revision: 391585
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=391585
Log:
Removed the stasis_http prefix from many of the generated functions
Modified:
team/dlee/ari-url-shuffle/res/res_stasis_http_asterisk.c
team/dlee/ari-url-shuffle/res/res_stasis_http_bridges.c
team/dlee/ari-url-shuffle/res/res_stasis_http_channels.c
team/dlee/ari-url-shuffle/res/res_stasis_http_endpoints.c
team/dlee/ari-url-shuffle/res/res_stasis_http_events.c
team/dlee/ari-url-shuffle/res/res_stasis_http_playback.c
team/dlee/ari-url-shuffle/res/res_stasis_http_recordings.c
team/dlee/ari-url-shuffle/res/res_stasis_http_sounds.c
team/dlee/ari-url-shuffle/res/stasis_http/resource_events.h
team/dlee/ari-url-shuffle/rest-api-templates/res_stasis_http_resource.c.mustache
team/dlee/ari-url-shuffle/rest-api-templates/rest_handler.mustache
Modified: team/dlee/ari-url-shuffle/res/res_stasis_http_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-url-shuffle/res/res_stasis_http_asterisk.c?view=diff&rev=391585&r1=391584&r2=391585
==============================================================================
--- team/dlee/ari-url-shuffle/res/res_stasis_http_asterisk.c (original)
+++ team/dlee/ari-url-shuffle/res/res_stasis_http_asterisk.c Wed Jun 12 17:17:16 2013
@@ -52,7 +52,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_asterisk_info_cb(
+static void get_asterisk_info_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -72,7 +72,7 @@
static struct stasis_rest_handlers asterisk_info = {
.path_segment = "info",
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_asterisk_info_cb,
+ [AST_HTTP_GET] = get_asterisk_info_cb,
},
.num_children = 0,
.children = { }
Modified: team/dlee/ari-url-shuffle/res/res_stasis_http_bridges.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-url-shuffle/res/res_stasis_http_bridges.c?view=diff&rev=391585&r1=391584&r2=391585
==============================================================================
--- team/dlee/ari-url-shuffle/res/res_stasis_http_bridges.c (original)
+++ team/dlee/ari-url-shuffle/res/res_stasis_http_bridges.c Wed Jun 12 17:17:16 2013
@@ -52,7 +52,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_bridges_cb(
+static void get_bridges_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -66,7 +66,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_new_bridge_cb(
+static void new_bridge_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -88,7 +88,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_bridge_cb(
+static void get_bridge_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -110,7 +110,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_delete_bridge_cb(
+static void delete_bridge_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -132,7 +132,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_add_channel_to_bridge_cb(
+static void add_channel_to_bridge_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -160,7 +160,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_remove_channel_from_bridge_cb(
+static void remove_channel_from_bridge_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -188,7 +188,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_record_bridge_cb(
+static void record_bridge_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -229,7 +229,7 @@
static struct stasis_rest_handlers bridges_bridgeId_addChannel = {
.path_segment = "addChannel",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_add_channel_to_bridge_cb,
+ [AST_HTTP_POST] = add_channel_to_bridge_cb,
},
.num_children = 0,
.children = { }
@@ -238,7 +238,7 @@
static struct stasis_rest_handlers bridges_bridgeId_removeChannel = {
.path_segment = "removeChannel",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_remove_channel_from_bridge_cb,
+ [AST_HTTP_POST] = remove_channel_from_bridge_cb,
},
.num_children = 0,
.children = { }
@@ -247,7 +247,7 @@
static struct stasis_rest_handlers bridges_bridgeId_record = {
.path_segment = "record",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_record_bridge_cb,
+ [AST_HTTP_POST] = record_bridge_cb,
},
.num_children = 0,
.children = { }
@@ -257,8 +257,8 @@
.path_segment = "bridgeId",
.is_wildcard = 1,
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_bridge_cb,
- [AST_HTTP_DELETE] = stasis_http_delete_bridge_cb,
+ [AST_HTTP_GET] = get_bridge_cb,
+ [AST_HTTP_DELETE] = delete_bridge_cb,
},
.num_children = 3,
.children = { &bridges_bridgeId_addChannel,&bridges_bridgeId_removeChannel,&bridges_bridgeId_record, }
@@ -267,8 +267,8 @@
static struct stasis_rest_handlers bridges = {
.path_segment = "bridges",
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_bridges_cb,
- [AST_HTTP_POST] = stasis_http_new_bridge_cb,
+ [AST_HTTP_GET] = get_bridges_cb,
+ [AST_HTTP_POST] = new_bridge_cb,
},
.num_children = 1,
.children = { &bridges_bridgeId, }
Modified: team/dlee/ari-url-shuffle/res/res_stasis_http_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-url-shuffle/res/res_stasis_http_channels.c?view=diff&rev=391585&r1=391584&r2=391585
==============================================================================
--- team/dlee/ari-url-shuffle/res/res_stasis_http_channels.c (original)
+++ team/dlee/ari-url-shuffle/res/res_stasis_http_channels.c Wed Jun 12 17:17:16 2013
@@ -52,7 +52,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_channels_cb(
+static void get_channels_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -66,7 +66,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_originate_cb(
+static void originate_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -106,7 +106,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_channel_cb(
+static void get_channel_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -128,7 +128,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_delete_channel_cb(
+static void delete_channel_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -150,7 +150,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_dial_cb(
+static void dial_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -184,7 +184,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_continue_in_dialplan_cb(
+static void continue_in_dialplan_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -206,7 +206,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_answer_channel_cb(
+static void answer_channel_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -228,7 +228,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_mute_channel_cb(
+static void mute_channel_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -256,7 +256,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_unmute_channel_cb(
+static void unmute_channel_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -284,7 +284,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_hold_channel_cb(
+static void hold_channel_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -306,7 +306,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_unhold_channel_cb(
+static void unhold_channel_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -328,7 +328,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_play_on_channel_cb(
+static void play_on_channel_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -365,7 +365,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_record_channel_cb(
+static void record_channel_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -409,7 +409,7 @@
static struct stasis_rest_handlers channels_channelId_dial = {
.path_segment = "dial",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_dial_cb,
+ [AST_HTTP_POST] = dial_cb,
},
.num_children = 0,
.children = { }
@@ -418,7 +418,7 @@
static struct stasis_rest_handlers channels_channelId_continue = {
.path_segment = "continue",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_continue_in_dialplan_cb,
+ [AST_HTTP_POST] = continue_in_dialplan_cb,
},
.num_children = 0,
.children = { }
@@ -427,7 +427,7 @@
static struct stasis_rest_handlers channels_channelId_answer = {
.path_segment = "answer",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_answer_channel_cb,
+ [AST_HTTP_POST] = answer_channel_cb,
},
.num_children = 0,
.children = { }
@@ -436,7 +436,7 @@
static struct stasis_rest_handlers channels_channelId_mute = {
.path_segment = "mute",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_mute_channel_cb,
+ [AST_HTTP_POST] = mute_channel_cb,
},
.num_children = 0,
.children = { }
@@ -445,7 +445,7 @@
static struct stasis_rest_handlers channels_channelId_unmute = {
.path_segment = "unmute",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_unmute_channel_cb,
+ [AST_HTTP_POST] = unmute_channel_cb,
},
.num_children = 0,
.children = { }
@@ -454,7 +454,7 @@
static struct stasis_rest_handlers channels_channelId_hold = {
.path_segment = "hold",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_hold_channel_cb,
+ [AST_HTTP_POST] = hold_channel_cb,
},
.num_children = 0,
.children = { }
@@ -463,7 +463,7 @@
static struct stasis_rest_handlers channels_channelId_unhold = {
.path_segment = "unhold",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_unhold_channel_cb,
+ [AST_HTTP_POST] = unhold_channel_cb,
},
.num_children = 0,
.children = { }
@@ -472,7 +472,7 @@
static struct stasis_rest_handlers channels_channelId_play = {
.path_segment = "play",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_play_on_channel_cb,
+ [AST_HTTP_POST] = play_on_channel_cb,
},
.num_children = 0,
.children = { }
@@ -481,7 +481,7 @@
static struct stasis_rest_handlers channels_channelId_record = {
.path_segment = "record",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_record_channel_cb,
+ [AST_HTTP_POST] = record_channel_cb,
},
.num_children = 0,
.children = { }
@@ -491,8 +491,8 @@
.path_segment = "channelId",
.is_wildcard = 1,
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_channel_cb,
- [AST_HTTP_DELETE] = stasis_http_delete_channel_cb,
+ [AST_HTTP_GET] = get_channel_cb,
+ [AST_HTTP_DELETE] = delete_channel_cb,
},
.num_children = 9,
.children = { &channels_channelId_dial,&channels_channelId_continue,&channels_channelId_answer,&channels_channelId_mute,&channels_channelId_unmute,&channels_channelId_hold,&channels_channelId_unhold,&channels_channelId_play,&channels_channelId_record, }
@@ -501,8 +501,8 @@
static struct stasis_rest_handlers channels = {
.path_segment = "channels",
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_channels_cb,
- [AST_HTTP_POST] = stasis_http_originate_cb,
+ [AST_HTTP_GET] = get_channels_cb,
+ [AST_HTTP_POST] = originate_cb,
},
.num_children = 1,
.children = { &channels_channelId, }
Modified: team/dlee/ari-url-shuffle/res/res_stasis_http_endpoints.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-url-shuffle/res/res_stasis_http_endpoints.c?view=diff&rev=391585&r1=391584&r2=391585
==============================================================================
--- team/dlee/ari-url-shuffle/res/res_stasis_http_endpoints.c (original)
+++ team/dlee/ari-url-shuffle/res/res_stasis_http_endpoints.c Wed Jun 12 17:17:16 2013
@@ -52,7 +52,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_endpoints_cb(
+static void get_endpoints_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -66,7 +66,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_endpoints_by_tech_cb(
+static void get_endpoints_by_tech_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -88,7 +88,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_endpoint_cb(
+static void get_endpoint_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -112,7 +112,7 @@
.path_segment = "resource",
.is_wildcard = 1,
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_endpoint_cb,
+ [AST_HTTP_GET] = get_endpoint_cb,
},
.num_children = 0,
.children = { }
@@ -122,7 +122,7 @@
.path_segment = "tech",
.is_wildcard = 1,
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_endpoints_by_tech_cb,
+ [AST_HTTP_GET] = get_endpoints_by_tech_cb,
},
.num_children = 1,
.children = { &endpoints_tech_resource, }
@@ -131,7 +131,7 @@
static struct stasis_rest_handlers endpoints = {
.path_segment = "endpoints",
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_endpoints_cb,
+ [AST_HTTP_GET] = get_endpoints_cb,
},
.num_children = 1,
.children = { &endpoints_tech, }
Modified: team/dlee/ari-url-shuffle/res/res_stasis_http_events.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-url-shuffle/res/res_stasis_http_events.c?view=diff&rev=391585&r1=391584&r2=391585
==============================================================================
--- team/dlee/ari-url-shuffle/res/res_stasis_http_events.c (original)
+++ team/dlee/ari-url-shuffle/res/res_stasis_http_events.c Wed Jun 12 17:17:16 2013
@@ -52,7 +52,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_event_websocket_cb(
+static void event_websocket_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -72,7 +72,7 @@
static struct stasis_rest_handlers events = {
.path_segment = "events",
.callbacks = {
- [AST_HTTP_GET] = stasis_http_event_websocket_cb,
+ [AST_HTTP_GET] = event_websocket_cb,
},
.num_children = 0,
.children = { }
Modified: team/dlee/ari-url-shuffle/res/res_stasis_http_playback.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-url-shuffle/res/res_stasis_http_playback.c?view=diff&rev=391585&r1=391584&r2=391585
==============================================================================
--- team/dlee/ari-url-shuffle/res/res_stasis_http_playback.c (original)
+++ team/dlee/ari-url-shuffle/res/res_stasis_http_playback.c Wed Jun 12 17:17:16 2013
@@ -52,7 +52,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_playback_cb(
+static void get_playback_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -74,7 +74,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_stop_playback_cb(
+static void stop_playback_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -96,7 +96,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_control_playback_cb(
+static void control_playback_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -122,7 +122,7 @@
static struct stasis_rest_handlers playback_playbackId_control = {
.path_segment = "control",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_control_playback_cb,
+ [AST_HTTP_POST] = control_playback_cb,
},
.num_children = 0,
.children = { }
@@ -132,8 +132,8 @@
.path_segment = "playbackId",
.is_wildcard = 1,
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_playback_cb,
- [AST_HTTP_DELETE] = stasis_http_stop_playback_cb,
+ [AST_HTTP_GET] = get_playback_cb,
+ [AST_HTTP_DELETE] = stop_playback_cb,
},
.num_children = 1,
.children = { &playback_playbackId_control, }
Modified: team/dlee/ari-url-shuffle/res/res_stasis_http_recordings.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-url-shuffle/res/res_stasis_http_recordings.c?view=diff&rev=391585&r1=391584&r2=391585
==============================================================================
--- team/dlee/ari-url-shuffle/res/res_stasis_http_recordings.c (original)
+++ team/dlee/ari-url-shuffle/res/res_stasis_http_recordings.c Wed Jun 12 17:17:16 2013
@@ -52,7 +52,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_recordings_cb(
+static void get_recordings_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -66,7 +66,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_stored_recordings_cb(
+static void get_stored_recordings_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -80,7 +80,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_stored_recording_cb(
+static void get_stored_recording_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -102,7 +102,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_delete_stored_recording_cb(
+static void delete_stored_recording_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -124,7 +124,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_live_recordings_cb(
+static void get_live_recordings_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -138,7 +138,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_live_recording_cb(
+static void get_live_recording_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -160,7 +160,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_cancel_recording_cb(
+static void cancel_recording_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -182,7 +182,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_stop_recording_cb(
+static void stop_recording_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -204,7 +204,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_pause_recording_cb(
+static void pause_recording_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -226,7 +226,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_unpause_recording_cb(
+static void unpause_recording_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -248,7 +248,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_mute_recording_cb(
+static void mute_recording_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -270,7 +270,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_unmute_recording_cb(
+static void unmute_recording_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -291,8 +291,8 @@
.path_segment = "recordingId",
.is_wildcard = 1,
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_stored_recording_cb,
- [AST_HTTP_DELETE] = stasis_http_delete_stored_recording_cb,
+ [AST_HTTP_GET] = get_stored_recording_cb,
+ [AST_HTTP_DELETE] = delete_stored_recording_cb,
},
.num_children = 0,
.children = { }
@@ -301,7 +301,7 @@
static struct stasis_rest_handlers recordings_stored = {
.path_segment = "stored",
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_stored_recordings_cb,
+ [AST_HTTP_GET] = get_stored_recordings_cb,
},
.num_children = 1,
.children = { &recordings_stored_recordingId, }
@@ -310,7 +310,7 @@
static struct stasis_rest_handlers recordings_live_recordingId_stop = {
.path_segment = "stop",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_stop_recording_cb,
+ [AST_HTTP_POST] = stop_recording_cb,
},
.num_children = 0,
.children = { }
@@ -319,7 +319,7 @@
static struct stasis_rest_handlers recordings_live_recordingId_pause = {
.path_segment = "pause",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_pause_recording_cb,
+ [AST_HTTP_POST] = pause_recording_cb,
},
.num_children = 0,
.children = { }
@@ -328,7 +328,7 @@
static struct stasis_rest_handlers recordings_live_recordingId_unpause = {
.path_segment = "unpause",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_unpause_recording_cb,
+ [AST_HTTP_POST] = unpause_recording_cb,
},
.num_children = 0,
.children = { }
@@ -337,7 +337,7 @@
static struct stasis_rest_handlers recordings_live_recordingId_mute = {
.path_segment = "mute",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_mute_recording_cb,
+ [AST_HTTP_POST] = mute_recording_cb,
},
.num_children = 0,
.children = { }
@@ -346,7 +346,7 @@
static struct stasis_rest_handlers recordings_live_recordingId_unmute = {
.path_segment = "unmute",
.callbacks = {
- [AST_HTTP_POST] = stasis_http_unmute_recording_cb,
+ [AST_HTTP_POST] = unmute_recording_cb,
},
.num_children = 0,
.children = { }
@@ -356,8 +356,8 @@
.path_segment = "recordingId",
.is_wildcard = 1,
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_live_recording_cb,
- [AST_HTTP_DELETE] = stasis_http_cancel_recording_cb,
+ [AST_HTTP_GET] = get_live_recording_cb,
+ [AST_HTTP_DELETE] = cancel_recording_cb,
},
.num_children = 5,
.children = { &recordings_live_recordingId_stop,&recordings_live_recordingId_pause,&recordings_live_recordingId_unpause,&recordings_live_recordingId_mute,&recordings_live_recordingId_unmute, }
@@ -366,7 +366,7 @@
static struct stasis_rest_handlers recordings_live = {
.path_segment = "live",
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_live_recordings_cb,
+ [AST_HTTP_GET] = get_live_recordings_cb,
},
.num_children = 1,
.children = { &recordings_live_recordingId, }
@@ -375,7 +375,7 @@
static struct stasis_rest_handlers recordings = {
.path_segment = "recordings",
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_recordings_cb,
+ [AST_HTTP_GET] = get_recordings_cb,
},
.num_children = 2,
.children = { &recordings_stored,&recordings_live, }
Modified: team/dlee/ari-url-shuffle/res/res_stasis_http_sounds.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-url-shuffle/res/res_stasis_http_sounds.c?view=diff&rev=391585&r1=391584&r2=391585
==============================================================================
--- team/dlee/ari-url-shuffle/res/res_stasis_http_sounds.c (original)
+++ team/dlee/ari-url-shuffle/res/res_stasis_http_sounds.c Wed Jun 12 17:17:16 2013
@@ -52,7 +52,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_sounds_cb(
+static void get_sounds_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -77,7 +77,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_get_stored_sound_cb(
+static void get_stored_sound_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
@@ -98,7 +98,7 @@
.path_segment = "soundId",
.is_wildcard = 1,
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_stored_sound_cb,
+ [AST_HTTP_GET] = get_stored_sound_cb,
},
.num_children = 0,
.children = { }
@@ -107,7 +107,7 @@
static struct stasis_rest_handlers sounds = {
.path_segment = "sounds",
.callbacks = {
- [AST_HTTP_GET] = stasis_http_get_sounds_cb,
+ [AST_HTTP_GET] = get_sounds_cb,
},
.num_children = 1,
.children = { &sounds_soundId, }
Modified: team/dlee/ari-url-shuffle/res/stasis_http/resource_events.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-url-shuffle/res/stasis_http/resource_events.h?view=diff&rev=391585&r1=391584&r2=391585
==============================================================================
--- team/dlee/ari-url-shuffle/res/stasis_http/resource_events.h (original)
+++ team/dlee/ari-url-shuffle/res/stasis_http/resource_events.h Wed Jun 12 17:17:16 2013
@@ -43,8 +43,6 @@
struct ast_event_websocket_args {
/*! \brief Comma seperated list of applications to subscribe to. */
const char *app;
- /*! \brief RFC6455 header for upgrading a connection to a websocket. */
- const char *upgrade;
};
/*!
* \brief WebSocket connection for events.
Modified: team/dlee/ari-url-shuffle/rest-api-templates/res_stasis_http_resource.c.mustache
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-url-shuffle/rest-api-templates/res_stasis_http_resource.c.mustache?view=diff&rev=391585&r1=391584&r2=391585
==============================================================================
--- team/dlee/ari-url-shuffle/rest-api-templates/res_stasis_http_resource.c.mustache (original)
+++ team/dlee/ari-url-shuffle/rest-api-templates/res_stasis_http_resource.c.mustache Wed Jun 12 17:17:16 2013
@@ -59,7 +59,7 @@
* \param headers HTTP headers.
* \param[out] response Response to the HTTP request.
*/
-static void stasis_http_{{c_nickname}}_cb(
+static void {{c_nickname}}_cb(
struct ast_variable *get_params, struct ast_variable *path_vars,
struct ast_variable *headers, struct stasis_http_response *response)
{
Modified: team/dlee/ari-url-shuffle/rest-api-templates/rest_handler.mustache
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ari-url-shuffle/rest-api-templates/rest_handler.mustache?view=diff&rev=391585&r1=391584&r2=391585
==============================================================================
--- team/dlee/ari-url-shuffle/rest-api-templates/rest_handler.mustache (original)
+++ team/dlee/ari-url-shuffle/rest-api-templates/rest_handler.mustache Wed Jun 12 17:17:16 2013
@@ -30,7 +30,7 @@
{{/is_wildcard}}
.callbacks = {
{{#operations}}
- [{{c_http_method}}] = stasis_http_{{c_nickname}}_cb,
+ [{{c_http_method}}] = {{c_nickname}}_cb,
{{/operations}}
},
.num_children = {{num_children}},
More information about the asterisk-commits
mailing list