diff options
Diffstat (limited to 'res/ari')
-rw-r--r-- | res/ari/resource_applications.c | 16 | ||||
-rw-r--r-- | res/ari/resource_applications.h | 24 | ||||
-rw-r--r-- | res/ari/resource_asterisk.c | 12 | ||||
-rw-r--r-- | res/ari/resource_asterisk.h | 18 | ||||
-rw-r--r-- | res/ari/resource_bridges.c | 40 | ||||
-rw-r--r-- | res/ari/resource_bridges.h | 62 | ||||
-rw-r--r-- | res/ari/resource_channels.c | 84 | ||||
-rw-r--r-- | res/ari/resource_channels.h | 108 | ||||
-rw-r--r-- | res/ari/resource_endpoints.c | 12 | ||||
-rw-r--r-- | res/ari/resource_endpoints.h | 18 | ||||
-rw-r--r-- | res/ari/resource_events.c | 4 | ||||
-rw-r--r-- | res/ari/resource_events.h | 6 | ||||
-rw-r--r-- | res/ari/resource_playback.c | 12 | ||||
-rw-r--r-- | res/ari/resource_playback.h | 18 | ||||
-rw-r--r-- | res/ari/resource_recordings.c | 40 | ||||
-rw-r--r-- | res/ari/resource_recordings.h | 60 | ||||
-rw-r--r-- | res/ari/resource_sounds.c | 13 | ||||
-rw-r--r-- | res/ari/resource_sounds.h | 12 |
18 files changed, 303 insertions, 256 deletions
diff --git a/res/ari/resource_applications.c b/res/ari/resource_applications.c index c422ad17f..aef939005 100644 --- a/res/ari/resource_applications.c +++ b/res/ari/resource_applications.c @@ -41,8 +41,8 @@ static int append_json(void *obj, void *arg, int flags) return 0; } -void ast_ari_get_applications(struct ast_variable *headers, - struct ast_get_applications_args *args, +void ast_ari_applications_list(struct ast_variable *headers, + struct ast_ari_applications_list_args *args, struct ast_ari_response *response) { RAII_VAR(struct ao2_container *, apps, NULL, ao2_cleanup); @@ -72,8 +72,8 @@ void ast_ari_get_applications(struct ast_variable *headers, ast_ari_response_ok(response, json); } -void ast_ari_get_application(struct ast_variable *headers, - struct ast_get_application_args *args, +void ast_ari_applications_get(struct ast_variable *headers, + struct ast_ari_applications_get_args *args, struct ast_ari_response *response) { RAII_VAR(struct ast_json *, json, NULL, ast_json_unref); @@ -89,8 +89,8 @@ void ast_ari_get_application(struct ast_variable *headers, ast_ari_response_ok(response, json); } -void ast_ari_application_subscribe(struct ast_variable *headers, - struct ast_application_subscribe_args *args, +void ast_ari_applications_subscribe(struct ast_variable *headers, + struct ast_ari_applications_subscribe_args *args, struct ast_ari_response *response) { RAII_VAR(struct ast_json *, json, NULL, ast_json_unref); @@ -134,8 +134,8 @@ void ast_ari_application_subscribe(struct ast_variable *headers, } } -void ast_ari_application_unsubscribe(struct ast_variable *headers, - struct ast_application_unsubscribe_args *args, +void ast_ari_applications_unsubscribe(struct ast_variable *headers, + struct ast_ari_applications_unsubscribe_args *args, struct ast_ari_response *response) { RAII_VAR(struct ast_json *, json, NULL, ast_json_unref); diff --git a/res/ari/resource_applications.h b/res/ari/resource_applications.h index 34da3c194..12aacb330 100644 --- a/res/ari/resource_applications.h +++ b/res/ari/resource_applications.h @@ -39,8 +39,8 @@ #include "asterisk/ari.h" -/*! \brief Argument struct for ast_ari_get_applications() */ -struct ast_get_applications_args { +/*! \brief Argument struct for ast_ari_applications_list() */ +struct ast_ari_applications_list_args { }; /*! * \brief List all applications. @@ -49,9 +49,9 @@ struct ast_get_applications_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_applications(struct ast_variable *headers, struct ast_get_applications_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_get_application() */ -struct ast_get_application_args { +void ast_ari_applications_list(struct ast_variable *headers, struct ast_ari_applications_list_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_applications_get() */ +struct ast_ari_applications_get_args { /*! \brief Application's name */ const char *application_name; }; @@ -62,9 +62,9 @@ struct ast_get_application_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_application(struct ast_variable *headers, struct ast_get_application_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_application_subscribe() */ -struct ast_application_subscribe_args { +void ast_ari_applications_get(struct ast_variable *headers, struct ast_ari_applications_get_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_applications_subscribe() */ +struct ast_ari_applications_subscribe_args { /*! \brief Application's name */ const char *application_name; /*! \brief Array of URI for event source (channel:{channelId}, bridge:{bridgeId}, endpoint:{tech}/{resource} */ @@ -83,9 +83,9 @@ struct ast_application_subscribe_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_application_subscribe(struct ast_variable *headers, struct ast_application_subscribe_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_application_unsubscribe() */ -struct ast_application_unsubscribe_args { +void ast_ari_applications_subscribe(struct ast_variable *headers, struct ast_ari_applications_subscribe_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_applications_unsubscribe() */ +struct ast_ari_applications_unsubscribe_args { /*! \brief Application's name */ const char *application_name; /*! \brief Array of URI for event source (channel:{channelId}, bridge:{bridgeId}, endpoint:{tech}/{resource} */ @@ -104,6 +104,6 @@ struct ast_application_unsubscribe_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_application_unsubscribe(struct ast_variable *headers, struct ast_application_unsubscribe_args *args, struct ast_ari_response *response); +void ast_ari_applications_unsubscribe(struct ast_variable *headers, struct ast_ari_applications_unsubscribe_args *args, struct ast_ari_response *response); #endif /* _ASTERISK_RESOURCE_APPLICATIONS_H */ diff --git a/res/ari/resource_asterisk.c b/res/ari/resource_asterisk.c index 268c07132..9871df4ff 100644 --- a/res/ari/resource_asterisk.c +++ b/res/ari/resource_asterisk.c @@ -37,8 +37,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/pbx.h" #include "resource_asterisk.h" -void ast_ari_get_asterisk_info(struct ast_variable *headers, - struct ast_get_asterisk_info_args *args, +void ast_ari_asterisk_get_info(struct ast_variable *headers, + struct ast_ari_asterisk_get_info_args *args, struct ast_ari_response *response) { RAII_VAR(struct ast_json *, json, NULL, ast_json_unref); @@ -140,7 +140,9 @@ void ast_ari_get_asterisk_info(struct ast_variable *headers, ast_ari_response_ok(response, ast_json_ref(json)); } -void ast_ari_get_global_var(struct ast_variable *headers, struct ast_get_global_var_args *args, struct ast_ari_response *response) +void ast_ari_asterisk_get_global_var(struct ast_variable *headers, + struct ast_ari_asterisk_get_global_var_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ast_json *, json, NULL, ast_json_unref); RAII_VAR(struct ast_str *, tmp, NULL, ast_free); @@ -172,7 +174,9 @@ void ast_ari_get_global_var(struct ast_variable *headers, struct ast_get_global_ ast_ari_response_ok(response, ast_json_ref(json)); } -void ast_ari_set_global_var(struct ast_variable *headers, struct ast_set_global_var_args *args, struct ast_ari_response *response) +void ast_ari_asterisk_set_global_var(struct ast_variable *headers, + struct ast_ari_asterisk_set_global_var_args *args, + struct ast_ari_response *response) { ast_assert(response != NULL); diff --git a/res/ari/resource_asterisk.h b/res/ari/resource_asterisk.h index d2f316a6b..aff89c445 100644 --- a/res/ari/resource_asterisk.h +++ b/res/ari/resource_asterisk.h @@ -39,8 +39,8 @@ #include "asterisk/ari.h" -/*! \brief Argument struct for ast_ari_get_asterisk_info() */ -struct ast_get_asterisk_info_args { +/*! \brief Argument struct for ast_ari_asterisk_get_info() */ +struct ast_ari_asterisk_get_info_args { /*! \brief Array of Filter information returned */ const char **only; /*! \brief Length of only array. */ @@ -55,9 +55,9 @@ struct ast_get_asterisk_info_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_asterisk_info(struct ast_variable *headers, struct ast_get_asterisk_info_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_get_global_var() */ -struct ast_get_global_var_args { +void ast_ari_asterisk_get_info(struct ast_variable *headers, struct ast_ari_asterisk_get_info_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_asterisk_get_global_var() */ +struct ast_ari_asterisk_get_global_var_args { /*! \brief The variable to get */ const char *variable; }; @@ -68,9 +68,9 @@ struct ast_get_global_var_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_global_var(struct ast_variable *headers, struct ast_get_global_var_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_set_global_var() */ -struct ast_set_global_var_args { +void ast_ari_asterisk_get_global_var(struct ast_variable *headers, struct ast_ari_asterisk_get_global_var_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_asterisk_set_global_var() */ +struct ast_ari_asterisk_set_global_var_args { /*! \brief The variable to set */ const char *variable; /*! \brief The value to set the variable to */ @@ -83,6 +83,6 @@ struct ast_set_global_var_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_set_global_var(struct ast_variable *headers, struct ast_set_global_var_args *args, struct ast_ari_response *response); +void ast_ari_asterisk_set_global_var(struct ast_variable *headers, struct ast_ari_asterisk_set_global_var_args *args, struct ast_ari_response *response); #endif /* _ASTERISK_RESOURCE_ASTERISK_H */ diff --git a/res/ari/resource_bridges.c b/res/ari/resource_bridges.c index 919171139..7c4fed29b 100644 --- a/res/ari/resource_bridges.c +++ b/res/ari/resource_bridges.c @@ -172,7 +172,9 @@ static struct control_list *control_list_create(struct ast_ari_response *respons return list; } -void ast_ari_add_channel_to_bridge(struct ast_variable *headers, struct ast_add_channel_to_bridge_args *args, struct ast_ari_response *response) +void ast_ari_bridges_add_channel(struct ast_variable *headers, + struct ast_ari_bridges_add_channel_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup); RAII_VAR(struct control_list *, list, NULL, ao2_cleanup); @@ -206,7 +208,9 @@ void ast_ari_add_channel_to_bridge(struct ast_variable *headers, struct ast_add_ ast_ari_response_no_content(response); } -void ast_ari_remove_channel_from_bridge(struct ast_variable *headers, struct ast_remove_channel_from_bridge_args *args, struct ast_ari_response *response) +void ast_ari_bridges_remove_channel(struct ast_variable *headers, + struct ast_ari_bridges_remove_channel_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup); RAII_VAR(struct control_list *, list, NULL, ao2_cleanup); @@ -290,7 +294,9 @@ static struct ast_channel *prepare_bridge_media_channel(const char *type) return ast_request(type, cap, NULL, "ARI", NULL); } -void ast_ari_play_on_bridge(struct ast_variable *headers, struct ast_play_on_bridge_args *args, struct ast_ari_response *response) +void ast_ari_bridges_play(struct ast_variable *headers, + struct ast_ari_bridges_play_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup); RAII_VAR(struct ast_channel *, play_channel, NULL, ast_hangup); @@ -385,7 +391,9 @@ void ast_ari_play_on_bridge(struct ast_variable *headers, struct ast_play_on_bri ast_ari_response_created(response, playback_url, json); } -void ast_ari_record_bridge(struct ast_variable *headers, struct ast_record_bridge_args *args, struct ast_ari_response *response) +void ast_ari_bridges_record(struct ast_variable *headers, + struct ast_ari_bridges_record_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup); RAII_VAR(struct ast_channel *, record_channel, NULL, ast_hangup); @@ -538,7 +546,9 @@ void ast_ari_record_bridge(struct ast_variable *headers, struct ast_record_bridg ast_ari_response_created(response, recording_url, json); } -void ast_ari_moh_start_bridge(struct ast_variable *headers, struct ast_moh_start_bridge_args *args, struct ast_ari_response *response) +void ast_ari_bridges_start_moh(struct ast_variable *headers, + struct ast_ari_bridges_start_moh_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup); struct ast_channel *moh_channel; @@ -561,7 +571,9 @@ void ast_ari_moh_start_bridge(struct ast_variable *headers, struct ast_moh_start } -void ast_ari_moh_stop_bridge(struct ast_variable *headers, struct ast_moh_stop_bridge_args *args, struct ast_ari_response *response) +void ast_ari_bridges_stop_moh(struct ast_variable *headers, + struct ast_ari_bridges_stop_moh_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup); @@ -580,7 +592,9 @@ void ast_ari_moh_stop_bridge(struct ast_variable *headers, struct ast_moh_stop_b ast_ari_response_no_content(response); } -void ast_ari_get_bridge(struct ast_variable *headers, struct ast_get_bridge_args *args, struct ast_ari_response *response) +void ast_ari_bridges_get(struct ast_variable *headers, + struct ast_ari_bridges_get_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ast_bridge_snapshot *, snapshot, ast_bridge_snapshot_get_latest(args->bridge_id), ao2_cleanup); if (!snapshot) { @@ -594,7 +608,9 @@ void ast_ari_get_bridge(struct ast_variable *headers, struct ast_get_bridge_args ast_bridge_snapshot_to_json(snapshot)); } -void ast_ari_delete_bridge(struct ast_variable *headers, struct ast_delete_bridge_args *args, struct ast_ari_response *response) +void ast_ari_bridges_destroy(struct ast_variable *headers, + struct ast_ari_bridges_destroy_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ast_bridge *, bridge, find_bridge(response, args->bridge_id), ao2_cleanup); if (!bridge) { @@ -605,7 +621,9 @@ void ast_ari_delete_bridge(struct ast_variable *headers, struct ast_delete_bridg ast_ari_response_no_content(response); } -void ast_ari_get_bridges(struct ast_variable *headers, struct ast_get_bridges_args *args, struct ast_ari_response *response) +void ast_ari_bridges_list(struct ast_variable *headers, + struct ast_ari_bridges_list_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_cache *, cache, NULL, ao2_cleanup); RAII_VAR(struct ao2_container *, snapshots, NULL, ao2_cleanup); @@ -648,7 +666,9 @@ void ast_ari_get_bridges(struct ast_variable *headers, struct ast_get_bridges_ar ast_ari_response_ok(response, ast_json_ref(json)); } -void ast_ari_new_bridge(struct ast_variable *headers, struct ast_new_bridge_args *args, struct ast_ari_response *response) +void ast_ari_bridges_create(struct ast_variable *headers, + struct ast_ari_bridges_create_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ast_bridge *, bridge, stasis_app_bridge_create(args->type), ao2_cleanup); RAII_VAR(struct ast_bridge_snapshot *, snapshot, NULL, ao2_cleanup); diff --git a/res/ari/resource_bridges.h b/res/ari/resource_bridges.h index abb372c1a..c5a832275 100644 --- a/res/ari/resource_bridges.h +++ b/res/ari/resource_bridges.h @@ -39,8 +39,8 @@ #include "asterisk/ari.h" -/*! \brief Argument struct for ast_ari_get_bridges() */ -struct ast_get_bridges_args { +/*! \brief Argument struct for ast_ari_bridges_list() */ +struct ast_ari_bridges_list_args { }; /*! * \brief List all active bridges in Asterisk. @@ -49,9 +49,9 @@ struct ast_get_bridges_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_bridges(struct ast_variable *headers, struct ast_get_bridges_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_new_bridge() */ -struct ast_new_bridge_args { +void ast_ari_bridges_list(struct ast_variable *headers, struct ast_ari_bridges_list_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_bridges_create() */ +struct ast_ari_bridges_create_args { /*! \brief Type of bridge to create. */ const char *type; }; @@ -64,9 +64,9 @@ struct ast_new_bridge_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_new_bridge(struct ast_variable *headers, struct ast_new_bridge_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_get_bridge() */ -struct ast_get_bridge_args { +void ast_ari_bridges_create(struct ast_variable *headers, struct ast_ari_bridges_create_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_bridges_get() */ +struct ast_ari_bridges_get_args { /*! \brief Bridge's id */ const char *bridge_id; }; @@ -77,9 +77,9 @@ struct ast_get_bridge_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_bridge(struct ast_variable *headers, struct ast_get_bridge_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_delete_bridge() */ -struct ast_delete_bridge_args { +void ast_ari_bridges_get(struct ast_variable *headers, struct ast_ari_bridges_get_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_bridges_destroy() */ +struct ast_ari_bridges_destroy_args { /*! \brief Bridge's id */ const char *bridge_id; }; @@ -92,9 +92,9 @@ struct ast_delete_bridge_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_delete_bridge(struct ast_variable *headers, struct ast_delete_bridge_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_add_channel_to_bridge() */ -struct ast_add_channel_to_bridge_args { +void ast_ari_bridges_destroy(struct ast_variable *headers, struct ast_ari_bridges_destroy_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_bridges_add_channel() */ +struct ast_ari_bridges_add_channel_args { /*! \brief Bridge's id */ const char *bridge_id; /*! \brief Array of Ids of channels to add to bridge */ @@ -113,9 +113,9 @@ struct ast_add_channel_to_bridge_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_add_channel_to_bridge(struct ast_variable *headers, struct ast_add_channel_to_bridge_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_remove_channel_from_bridge() */ -struct ast_remove_channel_from_bridge_args { +void ast_ari_bridges_add_channel(struct ast_variable *headers, struct ast_ari_bridges_add_channel_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_bridges_remove_channel() */ +struct ast_ari_bridges_remove_channel_args { /*! \brief Bridge's id */ const char *bridge_id; /*! \brief Array of Ids of channels to remove from bridge */ @@ -132,9 +132,9 @@ struct ast_remove_channel_from_bridge_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_remove_channel_from_bridge(struct ast_variable *headers, struct ast_remove_channel_from_bridge_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_moh_start_bridge() */ -struct ast_moh_start_bridge_args { +void ast_ari_bridges_remove_channel(struct ast_variable *headers, struct ast_ari_bridges_remove_channel_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_bridges_start_moh() */ +struct ast_ari_bridges_start_moh_args { /*! \brief Bridge's id */ const char *bridge_id; /*! \brief Channel's id */ @@ -147,24 +147,24 @@ struct ast_moh_start_bridge_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_moh_start_bridge(struct ast_variable *headers, struct ast_moh_start_bridge_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_moh_stop_bridge() */ -struct ast_moh_stop_bridge_args { +void ast_ari_bridges_start_moh(struct ast_variable *headers, struct ast_ari_bridges_start_moh_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_bridges_stop_moh() */ +struct ast_ari_bridges_stop_moh_args { /*! \brief Bridge's id */ const char *bridge_id; }; /*! * \brief Stop playing music on hold to a bridge. * - * This will only stop music on hold being played via bridges/{bridgeId}/mohStart. + * This will only stop music on hold being played via POST bridges/{bridgeId}/moh. * * \param headers HTTP headers * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_moh_stop_bridge(struct ast_variable *headers, struct ast_moh_stop_bridge_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_play_on_bridge() */ -struct ast_play_on_bridge_args { +void ast_ari_bridges_stop_moh(struct ast_variable *headers, struct ast_ari_bridges_stop_moh_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_bridges_play() */ +struct ast_ari_bridges_play_args { /*! \brief Bridge's id */ const char *bridge_id; /*! \brief Media's URI to play. */ @@ -185,9 +185,9 @@ struct ast_play_on_bridge_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_play_on_bridge(struct ast_variable *headers, struct ast_play_on_bridge_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_record_bridge() */ -struct ast_record_bridge_args { +void ast_ari_bridges_play(struct ast_variable *headers, struct ast_ari_bridges_play_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_bridges_record() */ +struct ast_ari_bridges_record_args { /*! \brief Bridge's id */ const char *bridge_id; /*! \brief Recording's filename */ @@ -214,6 +214,6 @@ struct ast_record_bridge_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_record_bridge(struct ast_variable *headers, struct ast_record_bridge_args *args, struct ast_ari_response *response); +void ast_ari_bridges_record(struct ast_variable *headers, struct ast_ari_bridges_record_args *args, struct ast_ari_response *response); #endif /* _ASTERISK_RESOURCE_BRIDGES_H */ diff --git a/res/ari/resource_channels.c b/res/ari/resource_channels.c index 482e4baa7..2b09a3281 100644 --- a/res/ari/resource_channels.c +++ b/res/ari/resource_channels.c @@ -81,9 +81,9 @@ static struct stasis_app_control *find_control( return control; } -void ast_ari_continue_in_dialplan( +void ast_ari_channels_continue_in_dialplan( struct ast_variable *headers, - struct ast_continue_in_dialplan_args *args, + struct ast_ari_channels_continue_in_dialplan_args *args, struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); @@ -103,9 +103,9 @@ void ast_ari_continue_in_dialplan( ast_ari_response_no_content(response); } -void ast_ari_answer_channel(struct ast_variable *headers, - struct ast_answer_channel_args *args, - struct ast_ari_response *response) +void ast_ari_channels_answer(struct ast_variable *headers, + struct ast_ari_channels_answer_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); @@ -124,9 +124,9 @@ void ast_ari_answer_channel(struct ast_variable *headers, ast_ari_response_no_content(response); } -void ast_ari_ring_channel(struct ast_variable *headers, - struct ast_ring_channel_args *args, - struct ast_ari_response *response) +void ast_ari_channels_ring(struct ast_variable *headers, + struct ast_ari_channels_ring_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); @@ -140,7 +140,9 @@ void ast_ari_ring_channel(struct ast_variable *headers, ast_ari_response_no_content(response); } -void ast_ari_mute_channel(struct ast_variable *headers, struct ast_mute_channel_args *args, struct ast_ari_response *response) +void ast_ari_channels_mute(struct ast_variable *headers, + struct ast_ari_channels_mute_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); unsigned int direction = 0; @@ -176,7 +178,9 @@ void ast_ari_mute_channel(struct ast_variable *headers, struct ast_mute_channel_ ast_ari_response_no_content(response); } -void ast_ari_unmute_channel(struct ast_variable *headers, struct ast_unmute_channel_args *args, struct ast_ari_response *response) +void ast_ari_channels_unmute(struct ast_variable *headers, + struct ast_ari_channels_unmute_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); unsigned int direction = 0; @@ -212,7 +216,9 @@ void ast_ari_unmute_channel(struct ast_variable *headers, struct ast_unmute_chan ast_ari_response_no_content(response); } -void ast_ari_send_dtmfchannel(struct ast_variable *headers, struct ast_send_dtmfchannel_args *args, struct ast_ari_response *response) +void ast_ari_channels_send_dtmf(struct ast_variable *headers, + struct ast_ari_channels_send_dtmf_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); @@ -233,7 +239,9 @@ void ast_ari_send_dtmfchannel(struct ast_variable *headers, struct ast_send_dtmf ast_ari_response_no_content(response); } -void ast_ari_hold_channel(struct ast_variable *headers, struct ast_hold_channel_args *args, struct ast_ari_response *response) +void ast_ari_channels_hold(struct ast_variable *headers, + struct ast_ari_channels_hold_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); @@ -248,7 +256,9 @@ void ast_ari_hold_channel(struct ast_variable *headers, struct ast_hold_channel_ ast_ari_response_no_content(response); } -void ast_ari_unhold_channel(struct ast_variable *headers, struct ast_unhold_channel_args *args, struct ast_ari_response *response) +void ast_ari_channels_unhold(struct ast_variable *headers, + struct ast_ari_channels_unhold_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); @@ -263,7 +273,9 @@ void ast_ari_unhold_channel(struct ast_variable *headers, struct ast_unhold_chan ast_ari_response_no_content(response); } -void ast_ari_moh_start_channel(struct ast_variable *headers, struct ast_moh_start_channel_args *args, struct ast_ari_response *response) +void ast_ari_channels_start_moh(struct ast_variable *headers, + struct ast_ari_channels_start_moh_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); @@ -277,7 +289,9 @@ void ast_ari_moh_start_channel(struct ast_variable *headers, struct ast_moh_star ast_ari_response_no_content(response); } -void ast_ari_moh_stop_channel(struct ast_variable *headers, struct ast_moh_stop_channel_args *args, struct ast_ari_response *response) +void ast_ari_channels_stop_moh(struct ast_variable *headers, + struct ast_ari_channels_stop_moh_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); @@ -291,8 +305,8 @@ void ast_ari_moh_stop_channel(struct ast_variable *headers, struct ast_moh_stop_ ast_ari_response_no_content(response); } -void ast_ari_play_on_channel(struct ast_variable *headers, - struct ast_play_on_channel_args *args, +void ast_ari_channels_play(struct ast_variable *headers, + struct ast_ari_channels_play_args *args, struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); @@ -363,8 +377,8 @@ void ast_ari_play_on_channel(struct ast_variable *headers, ast_ari_response_created(response, playback_url, json); } -void ast_ari_record_channel(struct ast_variable *headers, - struct ast_record_channel_args *args, +void ast_ari_channels_record(struct ast_variable *headers, + struct ast_ari_channels_record_args *args, struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); @@ -502,9 +516,9 @@ void ast_ari_record_channel(struct ast_variable *headers, ast_ari_response_created(response, recording_url, json); } -void ast_ari_get_channel(struct ast_variable *headers, - struct ast_get_channel_args *args, - struct ast_ari_response *response) +void ast_ari_channels_get(struct ast_variable *headers, + struct ast_ari_channels_get_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup); struct stasis_cache *cache; @@ -534,9 +548,9 @@ void ast_ari_get_channel(struct ast_variable *headers, ast_channel_snapshot_to_json(snapshot)); } -void ast_ari_delete_channel(struct ast_variable *headers, - struct ast_delete_channel_args *args, - struct ast_ari_response *response) +void ast_ari_channels_hangup(struct ast_variable *headers, + struct ast_ari_channels_hangup_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ast_channel *, chan, NULL, ao2_cleanup); int cause; @@ -568,9 +582,9 @@ void ast_ari_delete_channel(struct ast_variable *headers, ast_ari_response_no_content(response); } -void ast_ari_get_channels(struct ast_variable *headers, - struct ast_get_channels_args *args, - struct ast_ari_response *response) +void ast_ari_channels_list(struct ast_variable *headers, + struct ast_ari_channels_list_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_cache *, cache, NULL, ao2_cleanup); RAII_VAR(struct ao2_container *, snapshots, NULL, ao2_cleanup); @@ -615,9 +629,9 @@ void ast_ari_get_channels(struct ast_variable *headers, ast_ari_response_ok(response, ast_json_ref(json)); } -void ast_ari_originate(struct ast_variable *headers, - struct ast_originate_args *args, - struct ast_ari_response *response) +void ast_ari_channels_originate(struct ast_variable *headers, + struct ast_ari_channels_originate_args *args, + struct ast_ari_response *response) { char *dialtech; char dialdevice[AST_CHANNEL_NAME]; @@ -711,7 +725,9 @@ void ast_ari_originate(struct ast_variable *headers, ast_channel_unref(chan); } -void ast_ari_get_channel_var(struct ast_variable *headers, struct ast_get_channel_var_args *args, struct ast_ari_response *response) +void ast_ari_channels_get_channel_var(struct ast_variable *headers, + struct ast_ari_channels_get_channel_var_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ast_json *, json, NULL, ast_json_unref); RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); @@ -742,7 +758,9 @@ void ast_ari_get_channel_var(struct ast_variable *headers, struct ast_get_channe ast_ari_response_ok(response, ast_json_ref(json)); } -void ast_ari_set_channel_var(struct ast_variable *headers, struct ast_set_channel_var_args *args, struct ast_ari_response *response) +void ast_ari_channels_set_channel_var(struct ast_variable *headers, + struct ast_ari_channels_set_channel_var_args *args, + struct ast_ari_response *response) { RAII_VAR(struct stasis_app_control *, control, NULL, ao2_cleanup); diff --git a/res/ari/resource_channels.h b/res/ari/resource_channels.h index 02ad1a8cc..089f3fa7a 100644 --- a/res/ari/resource_channels.h +++ b/res/ari/resource_channels.h @@ -39,8 +39,8 @@ #include "asterisk/ari.h" -/*! \brief Argument struct for ast_ari_get_channels() */ -struct ast_get_channels_args { +/*! \brief Argument struct for ast_ari_channels_list() */ +struct ast_ari_channels_list_args { }; /*! * \brief List all active channels in Asterisk. @@ -49,9 +49,9 @@ struct ast_get_channels_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_channels(struct ast_variable *headers, struct ast_get_channels_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_originate() */ -struct ast_originate_args { +void ast_ari_channels_list(struct ast_variable *headers, struct ast_ari_channels_list_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_originate() */ +struct ast_ari_channels_originate_args { /*! \brief Endpoint to call. */ const char *endpoint; /*! \brief The extension to dial after the endpoint answers */ @@ -78,9 +78,9 @@ struct ast_originate_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_originate(struct ast_variable *headers, struct ast_originate_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_get_channel() */ -struct ast_get_channel_args { +void ast_ari_channels_originate(struct ast_variable *headers, struct ast_ari_channels_originate_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_get() */ +struct ast_ari_channels_get_args { /*! \brief Channel's id */ const char *channel_id; }; @@ -91,9 +91,9 @@ struct ast_get_channel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_channel(struct ast_variable *headers, struct ast_get_channel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_delete_channel() */ -struct ast_delete_channel_args { +void ast_ari_channels_get(struct ast_variable *headers, struct ast_ari_channels_get_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_hangup() */ +struct ast_ari_channels_hangup_args { /*! \brief Channel's id */ const char *channel_id; /*! \brief Reason for hanging up the channel */ @@ -106,9 +106,9 @@ struct ast_delete_channel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_delete_channel(struct ast_variable *headers, struct ast_delete_channel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_continue_in_dialplan() */ -struct ast_continue_in_dialplan_args { +void ast_ari_channels_hangup(struct ast_variable *headers, struct ast_ari_channels_hangup_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_continue_in_dialplan() */ +struct ast_ari_channels_continue_in_dialplan_args { /*! \brief Channel's id */ const char *channel_id; /*! \brief The context to continue to. */ @@ -125,9 +125,9 @@ struct ast_continue_in_dialplan_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_continue_in_dialplan(struct ast_variable *headers, struct ast_continue_in_dialplan_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_answer_channel() */ -struct ast_answer_channel_args { +void ast_ari_channels_continue_in_dialplan(struct ast_variable *headers, struct ast_ari_channels_continue_in_dialplan_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_answer() */ +struct ast_ari_channels_answer_args { /*! \brief Channel's id */ const char *channel_id; }; @@ -138,9 +138,9 @@ struct ast_answer_channel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_answer_channel(struct ast_variable *headers, struct ast_answer_channel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_ring_channel() */ -struct ast_ring_channel_args { +void ast_ari_channels_answer(struct ast_variable *headers, struct ast_ari_channels_answer_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_ring() */ +struct ast_ari_channels_ring_args { /*! \brief Channel's id */ const char *channel_id; }; @@ -151,9 +151,9 @@ struct ast_ring_channel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_ring_channel(struct ast_variable *headers, struct ast_ring_channel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_send_dtmfchannel() */ -struct ast_send_dtmfchannel_args { +void ast_ari_channels_ring(struct ast_variable *headers, struct ast_ari_channels_ring_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_send_dtmf() */ +struct ast_ari_channels_send_dtmf_args { /*! \brief Channel's id */ const char *channel_id; /*! \brief DTMF To send. */ @@ -174,9 +174,9 @@ struct ast_send_dtmfchannel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_send_dtmfchannel(struct ast_variable *headers, struct ast_send_dtmfchannel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_mute_channel() */ -struct ast_mute_channel_args { +void ast_ari_channels_send_dtmf(struct ast_variable *headers, struct ast_ari_channels_send_dtmf_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_mute() */ +struct ast_ari_channels_mute_args { /*! \brief Channel's id */ const char *channel_id; /*! \brief Direction in which to mute audio */ @@ -189,9 +189,9 @@ struct ast_mute_channel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_mute_channel(struct ast_variable *headers, struct ast_mute_channel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_unmute_channel() */ -struct ast_unmute_channel_args { +void ast_ari_channels_mute(struct ast_variable *headers, struct ast_ari_channels_mute_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_unmute() */ +struct ast_ari_channels_unmute_args { /*! \brief Channel's id */ const char *channel_id; /*! \brief Direction in which to unmute audio */ @@ -204,9 +204,9 @@ struct ast_unmute_channel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_unmute_channel(struct ast_variable *headers, struct ast_unmute_channel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_hold_channel() */ -struct ast_hold_channel_args { +void ast_ari_channels_unmute(struct ast_variable *headers, struct ast_ari_channels_unmute_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_hold() */ +struct ast_ari_channels_hold_args { /*! \brief Channel's id */ const char *channel_id; }; @@ -217,9 +217,9 @@ struct ast_hold_channel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_hold_channel(struct ast_variable *headers, struct ast_hold_channel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_unhold_channel() */ -struct ast_unhold_channel_args { +void ast_ari_channels_hold(struct ast_variable *headers, struct ast_ari_channels_hold_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_unhold() */ +struct ast_ari_channels_unhold_args { /*! \brief Channel's id */ const char *channel_id; }; @@ -230,9 +230,9 @@ struct ast_unhold_channel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_unhold_channel(struct ast_variable *headers, struct ast_unhold_channel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_moh_start_channel() */ -struct ast_moh_start_channel_args { +void ast_ari_channels_unhold(struct ast_variable *headers, struct ast_ari_channels_unhold_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_start_moh() */ +struct ast_ari_channels_start_moh_args { /*! \brief Channel's id */ const char *channel_id; /*! \brief Music on hold class to use */ @@ -247,9 +247,9 @@ struct ast_moh_start_channel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_moh_start_channel(struct ast_variable *headers, struct ast_moh_start_channel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_moh_stop_channel() */ -struct ast_moh_stop_channel_args { +void ast_ari_channels_start_moh(struct ast_variable *headers, struct ast_ari_channels_start_moh_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_stop_moh() */ +struct ast_ari_channels_stop_moh_args { /*! \brief Channel's id */ const char *channel_id; }; @@ -260,9 +260,9 @@ struct ast_moh_stop_channel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_moh_stop_channel(struct ast_variable *headers, struct ast_moh_stop_channel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_play_on_channel() */ -struct ast_play_on_channel_args { +void ast_ari_channels_stop_moh(struct ast_variable *headers, struct ast_ari_channels_stop_moh_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_play() */ +struct ast_ari_channels_play_args { /*! \brief Channel's id */ const char *channel_id; /*! \brief Media's URI to play. */ @@ -283,9 +283,9 @@ struct ast_play_on_channel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_play_on_channel(struct ast_variable *headers, struct ast_play_on_channel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_record_channel() */ -struct ast_record_channel_args { +void ast_ari_channels_play(struct ast_variable *headers, struct ast_ari_channels_play_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_record() */ +struct ast_ari_channels_record_args { /*! \brief Channel's id */ const char *channel_id; /*! \brief Recording's filename */ @@ -312,9 +312,9 @@ struct ast_record_channel_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_record_channel(struct ast_variable *headers, struct ast_record_channel_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_get_channel_var() */ -struct ast_get_channel_var_args { +void ast_ari_channels_record(struct ast_variable *headers, struct ast_ari_channels_record_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_get_channel_var() */ +struct ast_ari_channels_get_channel_var_args { /*! \brief Channel's id */ const char *channel_id; /*! \brief The channel variable or function to get */ @@ -327,9 +327,9 @@ struct ast_get_channel_var_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_channel_var(struct ast_variable *headers, struct ast_get_channel_var_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_set_channel_var() */ -struct ast_set_channel_var_args { +void ast_ari_channels_get_channel_var(struct ast_variable *headers, struct ast_ari_channels_get_channel_var_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_channels_set_channel_var() */ +struct ast_ari_channels_set_channel_var_args { /*! \brief Channel's id */ const char *channel_id; /*! \brief The channel variable or function to set */ @@ -344,6 +344,6 @@ struct ast_set_channel_var_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_set_channel_var(struct ast_variable *headers, struct ast_set_channel_var_args *args, struct ast_ari_response *response); +void ast_ari_channels_set_channel_var(struct ast_variable *headers, struct ast_ari_channels_set_channel_var_args *args, struct ast_ari_response *response); #endif /* _ASTERISK_RESOURCE_CHANNELS_H */ diff --git a/res/ari/resource_endpoints.c b/res/ari/resource_endpoints.c index caf20cb28..181ce7a50 100644 --- a/res/ari/resource_endpoints.c +++ b/res/ari/resource_endpoints.c @@ -33,8 +33,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/stasis.h" #include "asterisk/stasis_endpoints.h" -void ast_ari_get_endpoints(struct ast_variable *headers, - struct ast_get_endpoints_args *args, +void ast_ari_endpoints_list(struct ast_variable *headers, + struct ast_ari_endpoints_list_args *args, struct ast_ari_response *response) { RAII_VAR(struct stasis_cache *, cache, NULL, ao2_cleanup); @@ -79,8 +79,8 @@ void ast_ari_get_endpoints(struct ast_variable *headers, ast_ari_response_ok(response, ast_json_ref(json)); } -void ast_ari_get_endpoints_by_tech(struct ast_variable *headers, - struct ast_get_endpoints_by_tech_args *args, +void ast_ari_endpoints_list_by_tech(struct ast_variable *headers, + struct ast_ari_endpoints_list_by_tech_args *args, struct ast_ari_response *response) { RAII_VAR(struct stasis_cache *, cache, NULL, ao2_cleanup); @@ -133,8 +133,8 @@ void ast_ari_get_endpoints_by_tech(struct ast_variable *headers, ast_ari_response_ok(response, ast_json_ref(json)); } -void ast_ari_get_endpoint(struct ast_variable *headers, - struct ast_get_endpoint_args *args, +void ast_ari_endpoints_get(struct ast_variable *headers, + struct ast_ari_endpoints_get_args *args, struct ast_ari_response *response) { RAII_VAR(struct ast_json *, json, NULL, ast_json_unref); diff --git a/res/ari/resource_endpoints.h b/res/ari/resource_endpoints.h index 5d7aade68..1454a73c9 100644 --- a/res/ari/resource_endpoints.h +++ b/res/ari/resource_endpoints.h @@ -39,8 +39,8 @@ #include "asterisk/ari.h" -/*! \brief Argument struct for ast_ari_get_endpoints() */ -struct ast_get_endpoints_args { +/*! \brief Argument struct for ast_ari_endpoints_list() */ +struct ast_ari_endpoints_list_args { }; /*! * \brief List all endpoints. @@ -49,9 +49,9 @@ struct ast_get_endpoints_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_endpoints(struct ast_variable *headers, struct ast_get_endpoints_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_get_endpoints_by_tech() */ -struct ast_get_endpoints_by_tech_args { +void ast_ari_endpoints_list(struct ast_variable *headers, struct ast_ari_endpoints_list_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_endpoints_list_by_tech() */ +struct ast_ari_endpoints_list_by_tech_args { /*! \brief Technology of the endpoints (sip,iax2,...) */ const char *tech; }; @@ -62,9 +62,9 @@ struct ast_get_endpoints_by_tech_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_endpoints_by_tech(struct ast_variable *headers, struct ast_get_endpoints_by_tech_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_get_endpoint() */ -struct ast_get_endpoint_args { +void ast_ari_endpoints_list_by_tech(struct ast_variable *headers, struct ast_ari_endpoints_list_by_tech_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_endpoints_get() */ +struct ast_ari_endpoints_get_args { /*! \brief Technology of the endpoint */ const char *tech; /*! \brief ID of the endpoint */ @@ -77,6 +77,6 @@ struct ast_get_endpoint_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_endpoint(struct ast_variable *headers, struct ast_get_endpoint_args *args, struct ast_ari_response *response); +void ast_ari_endpoints_get(struct ast_variable *headers, struct ast_ari_endpoints_get_args *args, struct ast_ari_response *response); #endif /* _ASTERISK_RESOURCE_ENDPOINTS_H */ diff --git a/res/ari/resource_events.c b/res/ari/resource_events.c index dd474c3ce..098049fc6 100644 --- a/res/ari/resource_events.c +++ b/res/ari/resource_events.c @@ -168,9 +168,9 @@ static int session_register_app(struct event_session *session, return 0; } -void ast_ari_websocket_event_websocket(struct ast_ari_websocket_session *ws_session, +void ast_ari_websocket_events_event_websocket(struct ast_ari_websocket_session *ws_session, struct ast_variable *headers, - struct ast_event_websocket_args *args) + struct ast_ari_events_event_websocket_args *args) { RAII_VAR(struct event_session *, session, NULL, session_cleanup); struct ast_json *msg; diff --git a/res/ari/resource_events.h b/res/ari/resource_events.h index ac7600e03..96ee5b3ac 100644 --- a/res/ari/resource_events.h +++ b/res/ari/resource_events.h @@ -39,8 +39,8 @@ #include "asterisk/ari.h" -/*! \brief Argument struct for ast_ari_event_websocket() */ -struct ast_event_websocket_args { +/*! \brief Argument struct for ast_ari_events_event_websocket() */ +struct ast_ari_events_event_websocket_args { /*! \brief Array of Applications to subscribe to. */ const char **app; /*! \brief Length of app array. */ @@ -55,6 +55,6 @@ struct ast_event_websocket_args { * \param headers HTTP headers. * \param args Swagger parameters. */ -void ast_ari_websocket_event_websocket(struct ast_ari_websocket_session *session, struct ast_variable *headers, struct ast_event_websocket_args *args); +void ast_ari_websocket_events_event_websocket(struct ast_ari_websocket_session *session, struct ast_variable *headers, struct ast_ari_events_event_websocket_args *args); #endif /* _ASTERISK_RESOURCE_EVENTS_H */ diff --git a/res/ari/resource_playback.c b/res/ari/resource_playback.c index 7cb1d281c..30445ef93 100644 --- a/res/ari/resource_playback.c +++ b/res/ari/resource_playback.c @@ -30,8 +30,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/stasis_app_playback.h" #include "resource_playback.h" -void ast_ari_get_playback(struct ast_variable *headers, - struct ast_get_playback_args *args, +void ast_ari_playback_get(struct ast_variable *headers, + struct ast_ari_playback_get_args *args, struct ast_ari_response *response) { RAII_VAR(struct stasis_app_playback *, playback, NULL, ao2_cleanup); @@ -53,8 +53,8 @@ void ast_ari_get_playback(struct ast_variable *headers, ast_ari_response_ok(response, ast_json_ref(json)); } -void ast_ari_stop_playback(struct ast_variable *headers, - struct ast_stop_playback_args *args, +void ast_ari_playback_stop(struct ast_variable *headers, + struct ast_ari_playback_stop_args *args, struct ast_ari_response *response) { RAII_VAR(struct stasis_app_playback *, playback, NULL, ao2_cleanup); @@ -84,8 +84,8 @@ void ast_ari_stop_playback(struct ast_variable *headers, return; } } -void ast_ari_control_playback(struct ast_variable *headers, - struct ast_control_playback_args *args, +void ast_ari_playback_control(struct ast_variable *headers, + struct ast_ari_playback_control_args *args, struct ast_ari_response *response) { RAII_VAR(struct stasis_app_playback *, playback, NULL, ao2_cleanup); diff --git a/res/ari/resource_playback.h b/res/ari/resource_playback.h index 719997a00..e3a5c5526 100644 --- a/res/ari/resource_playback.h +++ b/res/ari/resource_playback.h @@ -39,8 +39,8 @@ #include "asterisk/ari.h" -/*! \brief Argument struct for ast_ari_get_playback() */ -struct ast_get_playback_args { +/*! \brief Argument struct for ast_ari_playback_get() */ +struct ast_ari_playback_get_args { /*! \brief Playback's id */ const char *playback_id; }; @@ -51,9 +51,9 @@ struct ast_get_playback_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_playback(struct ast_variable *headers, struct ast_get_playback_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_stop_playback() */ -struct ast_stop_playback_args { +void ast_ari_playback_get(struct ast_variable *headers, struct ast_ari_playback_get_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_playback_stop() */ +struct ast_ari_playback_stop_args { /*! \brief Playback's id */ const char *playback_id; }; @@ -64,9 +64,9 @@ struct ast_stop_playback_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_stop_playback(struct ast_variable *headers, struct ast_stop_playback_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_control_playback() */ -struct ast_control_playback_args { +void ast_ari_playback_stop(struct ast_variable *headers, struct ast_ari_playback_stop_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_playback_control() */ +struct ast_ari_playback_control_args { /*! \brief Playback's id */ const char *playback_id; /*! \brief Operation to perform on the playback. */ @@ -79,6 +79,6 @@ struct ast_control_playback_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_control_playback(struct ast_variable *headers, struct ast_control_playback_args *args, struct ast_ari_response *response); +void ast_ari_playback_control(struct ast_variable *headers, struct ast_ari_playback_control_args *args, struct ast_ari_response *response); #endif /* _ASTERISK_RESOURCE_PLAYBACK_H */ diff --git a/res/ari/resource_recordings.c b/res/ari/resource_recordings.c index d6803469f..418e3be63 100644 --- a/res/ari/resource_recordings.c +++ b/res/ari/resource_recordings.c @@ -30,8 +30,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/stasis_app_recording.h" #include "resource_recordings.h" -void ast_ari_get_stored_recordings(struct ast_variable *headers, - struct ast_get_stored_recordings_args *args, +void ast_ari_recordings_list_stored(struct ast_variable *headers, + struct ast_ari_recordings_list_stored_args *args, struct ast_ari_response *response) { RAII_VAR(struct ao2_container *, recordings, NULL, ao2_cleanup); @@ -70,8 +70,8 @@ void ast_ari_get_stored_recordings(struct ast_variable *headers, ast_ari_response_ok(response, ast_json_ref(json)); } -void ast_ari_get_stored_recording(struct ast_variable *headers, - struct ast_get_stored_recording_args *args, +void ast_ari_recordings_get_stored(struct ast_variable *headers, + struct ast_ari_recordings_get_stored_args *args, struct ast_ari_response *response) { RAII_VAR(struct stasis_app_stored_recording *, recording, NULL, @@ -96,8 +96,8 @@ void ast_ari_get_stored_recording(struct ast_variable *headers, ast_ari_response_ok(response, ast_json_ref(json)); } -void ast_ari_delete_stored_recording(struct ast_variable *headers, - struct ast_delete_stored_recording_args *args, +void ast_ari_recordings_delete_stored(struct ast_variable *headers, + struct ast_ari_recordings_delete_stored_args *args, struct ast_ari_response *response) { RAII_VAR(struct stasis_app_stored_recording *, recording, NULL, @@ -137,8 +137,8 @@ void ast_ari_delete_stored_recording(struct ast_variable *headers, ast_ari_response_no_content(response); } -void ast_ari_get_live_recording(struct ast_variable *headers, - struct ast_get_live_recording_args *args, +void ast_ari_recordings_get_live(struct ast_variable *headers, + struct ast_ari_recordings_get_live_args *args, struct ast_ari_response *response) { RAII_VAR(struct stasis_app_recording *, recording, NULL, ao2_cleanup); @@ -192,48 +192,48 @@ static void control_recording(const char *name, } } -void ast_ari_cancel_recording(struct ast_variable *headers, - struct ast_cancel_recording_args *args, +void ast_ari_recordings_cancel(struct ast_variable *headers, + struct ast_ari_recordings_cancel_args *args, struct ast_ari_response *response) { control_recording(args->recording_name, STASIS_APP_RECORDING_CANCEL, response); } -void ast_ari_stop_recording(struct ast_variable *headers, - struct ast_stop_recording_args *args, +void ast_ari_recordings_stop(struct ast_variable *headers, + struct ast_ari_recordings_stop_args *args, struct ast_ari_response *response) { control_recording(args->recording_name, STASIS_APP_RECORDING_STOP, response); } -void ast_ari_pause_recording(struct ast_variable *headers, - struct ast_pause_recording_args *args, +void ast_ari_recordings_pause(struct ast_variable *headers, + struct ast_ari_recordings_pause_args *args, struct ast_ari_response *response) { control_recording(args->recording_name, STASIS_APP_RECORDING_PAUSE, response); } -void ast_ari_unpause_recording(struct ast_variable *headers, - struct ast_unpause_recording_args *args, +void ast_ari_recordings_unpause(struct ast_variable *headers, + struct ast_ari_recordings_unpause_args *args, struct ast_ari_response *response) { control_recording(args->recording_name, STASIS_APP_RECORDING_UNPAUSE, response); } -void ast_ari_mute_recording(struct ast_variable *headers, - struct ast_mute_recording_args *args, +void ast_ari_recordings_mute(struct ast_variable *headers, + struct ast_ari_recordings_mute_args *args, struct ast_ari_response *response) { control_recording(args->recording_name, STASIS_APP_RECORDING_MUTE, response); } -void ast_ari_unmute_recording(struct ast_variable *headers, - struct ast_unmute_recording_args *args, +void ast_ari_recordings_unmute(struct ast_variable *headers, + struct ast_ari_recordings_unmute_args *args, struct ast_ari_response *response) { control_recording(args->recording_name, STASIS_APP_RECORDING_UNMUTE, diff --git a/res/ari/resource_recordings.h b/res/ari/resource_recordings.h index 682b45c56..676d8ab80 100644 --- a/res/ari/resource_recordings.h +++ b/res/ari/resource_recordings.h @@ -39,8 +39,8 @@ #include "asterisk/ari.h" -/*! \brief Argument struct for ast_ari_get_stored_recordings() */ -struct ast_get_stored_recordings_args { +/*! \brief Argument struct for ast_ari_recordings_list_stored() */ +struct ast_ari_recordings_list_stored_args { }; /*! * \brief List recordings that are complete. @@ -49,9 +49,9 @@ struct ast_get_stored_recordings_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_stored_recordings(struct ast_variable *headers, struct ast_get_stored_recordings_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_get_stored_recording() */ -struct ast_get_stored_recording_args { +void ast_ari_recordings_list_stored(struct ast_variable *headers, struct ast_ari_recordings_list_stored_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_recordings_get_stored() */ +struct ast_ari_recordings_get_stored_args { /*! \brief The name of the recording */ const char *recording_name; }; @@ -62,9 +62,9 @@ struct ast_get_stored_recording_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_stored_recording(struct ast_variable *headers, struct ast_get_stored_recording_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_delete_stored_recording() */ -struct ast_delete_stored_recording_args { +void ast_ari_recordings_get_stored(struct ast_variable *headers, struct ast_ari_recordings_get_stored_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_recordings_delete_stored() */ +struct ast_ari_recordings_delete_stored_args { /*! \brief The name of the recording */ const char *recording_name; }; @@ -75,9 +75,9 @@ struct ast_delete_stored_recording_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_delete_stored_recording(struct ast_variable *headers, struct ast_delete_stored_recording_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_get_live_recording() */ -struct ast_get_live_recording_args { +void ast_ari_recordings_delete_stored(struct ast_variable *headers, struct ast_ari_recordings_delete_stored_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_recordings_get_live() */ +struct ast_ari_recordings_get_live_args { /*! \brief The name of the recording */ const char *recording_name; }; @@ -88,9 +88,9 @@ struct ast_get_live_recording_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_live_recording(struct ast_variable *headers, struct ast_get_live_recording_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_cancel_recording() */ -struct ast_cancel_recording_args { +void ast_ari_recordings_get_live(struct ast_variable *headers, struct ast_ari_recordings_get_live_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_recordings_cancel() */ +struct ast_ari_recordings_cancel_args { /*! \brief The name of the recording */ const char *recording_name; }; @@ -101,9 +101,9 @@ struct ast_cancel_recording_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_cancel_recording(struct ast_variable *headers, struct ast_cancel_recording_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_stop_recording() */ -struct ast_stop_recording_args { +void ast_ari_recordings_cancel(struct ast_variable *headers, struct ast_ari_recordings_cancel_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_recordings_stop() */ +struct ast_ari_recordings_stop_args { /*! \brief The name of the recording */ const char *recording_name; }; @@ -114,9 +114,9 @@ struct ast_stop_recording_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_stop_recording(struct ast_variable *headers, struct ast_stop_recording_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_pause_recording() */ -struct ast_pause_recording_args { +void ast_ari_recordings_stop(struct ast_variable *headers, struct ast_ari_recordings_stop_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_recordings_pause() */ +struct ast_ari_recordings_pause_args { /*! \brief The name of the recording */ const char *recording_name; }; @@ -129,9 +129,9 @@ struct ast_pause_recording_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_pause_recording(struct ast_variable *headers, struct ast_pause_recording_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_unpause_recording() */ -struct ast_unpause_recording_args { +void ast_ari_recordings_pause(struct ast_variable *headers, struct ast_ari_recordings_pause_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_recordings_unpause() */ +struct ast_ari_recordings_unpause_args { /*! \brief The name of the recording */ const char *recording_name; }; @@ -142,9 +142,9 @@ struct ast_unpause_recording_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_unpause_recording(struct ast_variable *headers, struct ast_unpause_recording_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_mute_recording() */ -struct ast_mute_recording_args { +void ast_ari_recordings_unpause(struct ast_variable *headers, struct ast_ari_recordings_unpause_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_recordings_mute() */ +struct ast_ari_recordings_mute_args { /*! \brief The name of the recording */ const char *recording_name; }; @@ -157,9 +157,9 @@ struct ast_mute_recording_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_mute_recording(struct ast_variable *headers, struct ast_mute_recording_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_unmute_recording() */ -struct ast_unmute_recording_args { +void ast_ari_recordings_mute(struct ast_variable *headers, struct ast_ari_recordings_mute_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_recordings_unmute() */ +struct ast_ari_recordings_unmute_args { /*! \brief The name of the recording */ const char *recording_name; }; @@ -170,6 +170,6 @@ struct ast_unmute_recording_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_unmute_recording(struct ast_variable *headers, struct ast_unmute_recording_args *args, struct ast_ari_response *response); +void ast_ari_recordings_unmute(struct ast_variable *headers, struct ast_ari_recordings_unmute_args *args, struct ast_ari_response *response); #endif /* _ASTERISK_RESOURCE_RECORDINGS_H */ diff --git a/res/ari/resource_sounds.c b/res/ari/resource_sounds.c index f77c8a227..5be4bf9a8 100644 --- a/res/ari/resource_sounds.c +++ b/res/ari/resource_sounds.c @@ -95,7 +95,8 @@ static int filter_langs_cb(void *obj, void *arg, int flags) } /*! \brief Generate a Sound structure as documented in sounds.json for the specified filename */ -static struct ast_json *create_sound_blob(const char *filename, struct ast_get_sounds_args *args) +static struct ast_json *create_sound_blob(const char *filename, + struct ast_ari_sounds_list_args *args) { RAII_VAR(struct ast_json *, sound, NULL, ast_json_unref); RAII_VAR(struct ao2_container *, languages, NULL, ao2_cleanup); @@ -163,7 +164,7 @@ static int append_sound_cb(void *obj, void *arg, void *data, int flags) { struct ast_json *sounds_array = arg; char *filename = obj; - struct ast_get_sounds_args *args = data; + struct ast_ari_sounds_list_args *args = data; struct ast_json *sound_blob = create_sound_blob(filename, args); if (!sound_blob) { return 0; @@ -173,7 +174,9 @@ static int append_sound_cb(void *obj, void *arg, void *data, int flags) return 0; } -void ast_ari_get_sounds(struct ast_variable *headers, struct ast_get_sounds_args *args, struct ast_ari_response *response) +void ast_ari_sounds_list(struct ast_variable *headers, + struct ast_ari_sounds_list_args *args, + struct ast_ari_response *response) { RAII_VAR(struct ao2_container *, sound_files, NULL, ao2_cleanup); struct ast_json *sounds_blob; @@ -206,7 +209,9 @@ void ast_ari_get_sounds(struct ast_variable *headers, struct ast_get_sounds_args ast_ari_response_ok(response, sounds_blob); } -void ast_ari_get_stored_sound(struct ast_variable *headers, struct ast_get_stored_sound_args *args, struct ast_ari_response *response) +void ast_ari_sounds_get(struct ast_variable *headers, + struct ast_ari_sounds_get_args *args, + struct ast_ari_response *response) { struct ast_json *sound_blob; diff --git a/res/ari/resource_sounds.h b/res/ari/resource_sounds.h index fa7cda23c..5e8ddd43d 100644 --- a/res/ari/resource_sounds.h +++ b/res/ari/resource_sounds.h @@ -39,8 +39,8 @@ #include "asterisk/ari.h" -/*! \brief Argument struct for ast_ari_get_sounds() */ -struct ast_get_sounds_args { +/*! \brief Argument struct for ast_ari_sounds_list() */ +struct ast_ari_sounds_list_args { /*! \brief Lookup sound for a specific language. */ const char *lang; /*! \brief Lookup sound in a specific format. */ @@ -53,9 +53,9 @@ struct ast_get_sounds_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_sounds(struct ast_variable *headers, struct ast_get_sounds_args *args, struct ast_ari_response *response); -/*! \brief Argument struct for ast_ari_get_stored_sound() */ -struct ast_get_stored_sound_args { +void ast_ari_sounds_list(struct ast_variable *headers, struct ast_ari_sounds_list_args *args, struct ast_ari_response *response); +/*! \brief Argument struct for ast_ari_sounds_get() */ +struct ast_ari_sounds_get_args { /*! \brief Sound's id */ const char *sound_id; }; @@ -66,6 +66,6 @@ struct ast_get_stored_sound_args { * \param args Swagger parameters * \param[out] response HTTP response */ -void ast_ari_get_stored_sound(struct ast_variable *headers, struct ast_get_stored_sound_args *args, struct ast_ari_response *response); +void ast_ari_sounds_get(struct ast_variable *headers, struct ast_ari_sounds_get_args *args, struct ast_ari_response *response); #endif /* _ASTERISK_RESOURCE_SOUNDS_H */ |