[asterisk-commits] mmichelson: branch group/CCSS r226647 - in /team/group/CCSS: include/asterisk...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Oct 30 16:25:32 2009
New Revision: 226647

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=226647
Log:
Change the "recall" agent callback to be called "callee_available"
instead.

This is because in actuality, the agent is not actually recalling the
caller (well, the generic agent does, but none other will). Instead,
the agent is making it known to the caller that the callee is available
and that it should initiate a callback if possible.


Modified:
    team/group/CCSS/include/asterisk/ccss.h
    team/group/CCSS/main/ccss.c

Modified: team/group/CCSS/include/asterisk/ccss.h
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/include/asterisk/ccss.h?view=diff&rev=226647&r1=226646&r2=226647
==============================================================================
--- team/group/CCSS/include/asterisk/ccss.h (original)
+++ team/group/CCSS/include/asterisk/ccss.h Fri Oct 30 16:25:32 2009
@@ -845,7 +845,7 @@
 	 * take whatever action is necessary in order to
 	 * make his device initiate a CC recall.
 	 */
-	int (*recall)(struct ast_cc_agent *agent);
+	int (*callee_available)(struct ast_cc_agent *agent);
 	/*!
 	 * \brief Destroy private data on the agent
 	 *

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=226647&r1=226646&r2=226647
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Fri Oct 30 16:25:32 2009
@@ -1766,7 +1766,7 @@
 	ast_assert(callbacks->status_request != NULL);
 	ast_assert(callbacks->start_monitoring != NULL);
 	ast_assert(callbacks->stop_monitoring != NULL);
-	ast_assert(callbacks->recall != NULL);
+	ast_assert(callbacks->callee_available != NULL);
 	ast_assert(callbacks->destructor != NULL);
 }
 
@@ -1832,7 +1832,7 @@
 	.status_request = cc_generic_agent_status_request,
 	.start_monitoring = cc_generic_agent_start_monitoring,
 	.stop_monitoring = cc_generic_agent_stop_monitoring,
-	.recall = cc_generic_agent_recall,
+	.callee_available = cc_generic_agent_recall,
 	.destructor = cc_generic_agent_destructor,
 };
 
@@ -2470,7 +2470,7 @@
 
 static int cc_callee_ready(struct cc_core_instance *core_instance, struct cc_state_change_args *args, enum cc_state previous_state)
 {
-	core_instance->agent->callbacks->recall(core_instance->agent);
+	core_instance->agent->callbacks->callee_available(core_instance->agent);
 	return 0;
 }