[svn-commits] mmichelson: branch group/CCSS r247913 - /team/group/CCSS/main/ccss.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Feb 19 11:32:55 2010
New Revision: 247913

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247913
Log:
s/ast_control_cc_payload/cc_control_payload/

Mainly done since the structure is not visible outside of ccss.c

Modified:
    team/group/CCSS/main/ccss.c

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=247913&r1=247912&r2=247913
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Fri Feb 19 11:32:55 2010
@@ -144,7 +144,7 @@
  * a called device so that the CC core will be able
  * to allocate the proper monitoring resources.
  */
-struct ast_control_cc_payload {
+struct cc_control_payload {
 	/*!
 	 * \brief The type of monitor to allocate.
 	 *
@@ -271,7 +271,7 @@
  * \retval non-NULL A reference to the newly created cc_core_instance
  */
 static struct cc_core_instance *cc_core_init_instance(struct ast_channel *caller_chan,
-		struct cc_monitor_tree *called_tree, const int core_id, struct ast_control_cc_payload *cc_data);
+		struct cc_monitor_tree *called_tree, const int core_id, struct cc_control_payload *cc_data);
 
 static const char *CC_LOGGER_LEVEL_NAME = "CC";
 static int cc_logger_level;
@@ -1866,7 +1866,7 @@
  * \retval NULL Memory allocation failure
  * \retval non-NULL The new ast_cc_interface created.
  */
-static struct ast_cc_monitor *cc_device_monitor_init(const char * const device_name, const char * const dialstring, const struct ast_control_cc_payload *cc_data, int core_id)
+static struct ast_cc_monitor *cc_device_monitor_init(const char * const device_name, const char * const dialstring, const struct cc_control_payload *cc_data, int core_id)
 {
 	struct ast_cc_interface *cc_interface;
 	struct ast_cc_monitor *monitor;
@@ -1943,7 +1943,7 @@
 	struct ast_cc_monitor *monitor;
 	struct ast_datastore *cc_datastore;
 	struct dialed_cc_interfaces *cc_interfaces;
-	struct ast_control_cc_payload *cc_data = frame_data;
+	struct cc_control_payload *cc_data = frame_data;
 	struct cc_core_instance *core_instance;
 
 	device_name = cc_data->device_name;
@@ -2509,7 +2509,7 @@
 }
 
 static struct cc_core_instance *cc_core_init_instance(struct ast_channel *caller_chan,
-		struct cc_monitor_tree *called_tree, const int core_id, struct ast_control_cc_payload *cc_data)
+		struct cc_monitor_tree *called_tree, const int core_id, struct cc_control_payload *cc_data)
 {
 	char caller[AST_CHANNEL_NAME];
 	struct cc_core_instance *core_instance;
@@ -3691,7 +3691,7 @@
 
 static int cc_build_payload(struct ast_channel *chan, struct ast_cc_config_params *cc_params,
 	const char *monitor_type, const char * const device_name, const char * dialstring,
-	enum ast_cc_service_type service, void *private_data, struct ast_control_cc_payload *payload)
+	enum ast_cc_service_type service, void *private_data, struct cc_control_payload *payload)
 {
 	struct ast_datastore *datastore;
 	struct dialed_cc_interfaces *cc_interfaces;
@@ -3749,7 +3749,7 @@
 	const char * const dialstring, enum ast_cc_service_type service, void *private_data,
 	struct ast_frame *frame)
 {
-	struct ast_control_cc_payload *payload = ast_calloc(1, sizeof(*payload));
+	struct cc_control_payload *payload = ast_calloc(1, sizeof(*payload));
 
 	if (!payload) {
 		return -1;
@@ -3770,7 +3770,7 @@
 void ast_cc_call_failed(struct ast_channel *incoming, struct ast_channel *outgoing, const char * const dialstring)
 {
 	char device_name[AST_CHANNEL_NAME];
-	struct ast_control_cc_payload payload;
+	struct cc_control_payload payload;
 	struct ast_cc_config_params *cc_params;
 
 	if (outgoing->hangupcause != AST_CAUSE_BUSY && outgoing->hangupcause != AST_CAUSE_CONGESTION) {
@@ -3803,7 +3803,7 @@
 void ast_cc_busy_interface(struct ast_channel *inbound, struct ast_cc_config_params *cc_params,
 	const char *monitor_type, const char * const device_name, const char * const dialstring, void *private_data)
 {
-	struct ast_control_cc_payload payload;
+	struct cc_control_payload payload;
 	if (cc_build_payload(inbound, cc_params, monitor_type, device_name, dialstring, AST_CC_CCBS, private_data, &payload)) {
 		/* Something screwed up. Don't try to handle this payload */
 		call_destructor_with_no_monitor(monitor_type, private_data);