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

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Nov  5 14:07:01 2009
New Revision: 228149

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=228149
Log:
Fix some doxygen and change the name of ast_cc_monitor_request_acknowledged to
ast_cc_monitor_request_acked.


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=228149&r1=228148&r2=228149
==============================================================================
--- team/group/CCSS/include/asterisk/ccss.h (original)
+++ team/group/CCSS/include/asterisk/ccss.h Thu Nov  5 14:07:01 2009
@@ -617,7 +617,7 @@
  *
  * It is recommended that an entity which receives an incoming
  * CC request calls this function before calling
- * ast_cc_accept_request. This way, immediate feedback can be
+ * ast_cc_agent_accept_request. This way, immediate feedback can be
  * given to the caller about why his request was rejected.
  *
  * If this is not called and a state change to CC_CALLER_REQUESTED
@@ -813,12 +813,11 @@
 	/*!
 	 * \brief Begin monitoring a busy device
 	 *
-	 * The core will call this callback when the
-	 * CC_CALLER_BUSY state is entered. The agent
-	 * should begin monitoring the caller and report
-	 * to the core when the caller has become available
-	 * by requesting a state change to the CC_ACTIVE
-	 * state.
+	 * The core will call this callback if the callee becomes
+	 * available but the caller has reported that he is busy.
+	 * The agent should begin monitoring the caller's device.
+	 * When the caller becomes available again, the agent should
+	 * call ast_cc_agent_caller_available.
 	 */
 	int (*start_monitoring)(struct ast_cc_agent *agent);
 	/*!
@@ -891,7 +890,7 @@
  * \retval 0 Success
  * \retval -1 Failure
  */
-int ast_cc_monitor_request_acknowledged(int core_id, const char * const debug);
+int ast_cc_monitor_request_acked(int core_id, const char * const debug);
 
 /*!
  * \since 1.6.4

Modified: team/group/CCSS/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=228149&r1=228148&r2=228149
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Thu Nov  5 14:07:01 2009
@@ -1064,7 +1064,7 @@
 	 * will that mean a missed opportunity?
 	 */
 	if (service == AST_CC_CCBS && gen_mon_pvt->current_state == AST_DEVICE_NOT_INUSE) {
-		ast_cc_monitor_request_acknowledged(core_id, "Formality. Device is already available but we have to go through the motions\n");
+		ast_cc_monitor_request_acked(core_id, "Formality. Device is already available but we have to go through the motions\n");
 		return ast_cc_monitor_callee_available(monitor);
 	}
 
@@ -1080,7 +1080,7 @@
 			AST_EVENT_IE_END))) {
 		return -1;
 	}
-	ast_cc_monitor_request_acknowledged(core_id, "Generic monitor subscribed to device state.\n");
+	ast_cc_monitor_request_acked(core_id, "Generic monitor subscribed to device state.\n");
 	return 0;
 }
 
@@ -2817,7 +2817,7 @@
 	return cc_request_state_change(CC_CALLER_REQUESTED, core_id, debug);
 }
 
-int ast_cc_monitor_request_acknowledged(int core_id, const char * const debug)
+int ast_cc_monitor_request_acked(int core_id, const char * const debug)
 {
 	return cc_request_state_change(CC_ACTIVE, core_id, debug);
 }