[asterisk-commits] mmichelson: branch group/ccss_failure_response r296865 - in /team/group/ccss_...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Nov 30 18:11:38 2010
New Revision: 296865

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=296865
Log:
Add AST_ prefix to new constants.


Modified:
    team/group/ccss_failure_response/channels/chan_sip.c
    team/group/ccss_failure_response/include/asterisk/ccss.h
    team/group/ccss_failure_response/main/ccss.c

Modified: team/group/ccss_failure_response/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/ccss_failure_response/channels/chan_sip.c?view=diff&rev=296865&r1=296864&r2=296865
==============================================================================
--- team/group/ccss_failure_response/channels/chan_sip.c (original)
+++ team/group/ccss_failure_response/channels/chan_sip.c Tue Nov 30 18:11:38 2010
@@ -1719,7 +1719,7 @@
 
 	sip_pvt_lock(agent_pvt->subscribe_pvt);
 	ast_set_flag(&agent_pvt->subscribe_pvt->flags[1], SIP_PAGE2_DIALOG_ESTABLISHED);
-	if (reason == CC_AGENT_RESPONSE_SUCCESS) {
+	if (reason == AST_CC_AGENT_RESPONSE_SUCCESS) {
 		transmit_response(agent_pvt->subscribe_pvt, "200 OK", &agent_pvt->subscribe_pvt->initreq);
 		transmit_cc_notify(agent, agent_pvt->subscribe_pvt, CC_QUEUED);
 	} else {

Modified: team/group/ccss_failure_response/include/asterisk/ccss.h
URL: http://svnview.digium.com/svn/asterisk/team/group/ccss_failure_response/include/asterisk/ccss.h?view=diff&rev=296865&r1=296864&r2=296865
==============================================================================
--- team/group/ccss_failure_response/include/asterisk/ccss.h (original)
+++ team/group/ccss_failure_response/include/asterisk/ccss.h Tue Nov 30 18:11:38 2010
@@ -859,9 +859,9 @@
 };
 
 enum cc_agent_response_reason {
-	CC_AGENT_RESPONSE_SUCCESS,
-	CC_AGENT_RESPONSE_FAILURE_SHORTTERM,
-	CC_AGENT_RESPONSE_FAILURE_LONGTERM,
+	AST_CC_AGENT_RESPONSE_SUCCESS,
+	AST_CC_AGENT_RESPONSE_FAILURE_SHORTTERM,
+	AST_CC_AGENT_RESPONSE_FAILURE_LONGTERM,
 	/* XXX Can't recall what else */
 };
 

Modified: team/group/ccss_failure_response/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/ccss_failure_response/main/ccss.c?view=diff&rev=296865&r1=296864&r2=296865
==============================================================================
--- team/group/ccss_failure_response/main/ccss.c (original)
+++ team/group/ccss_failure_response/main/ccss.c Tue Nov 30 18:11:38 2010
@@ -2806,7 +2806,7 @@
 	 *    call monitor's unsuspend callback.
 	 */
 	if (previous_state == CC_CALLER_REQUESTED) {
-		core_instance->agent->callbacks->respond(core_instance->agent, CC_AGENT_RESPONSE_SUCCESS);
+		core_instance->agent->callbacks->respond(core_instance->agent, AST_CC_AGENT_RESPONSE_SUCCESS);
 		manager_event(EVENT_FLAG_CC, "CCRequestAcknowledged",
 			"CoreID: %d\r\n"
 			"Caller: %s\r\n",
@@ -2956,7 +2956,7 @@
 			/* For out-of-order requests, we need to let the requester know that
 			 * we can't handle the request now.
 			 */
-			core_instance->agent->callbacks->respond(core_instance->agent, CC_AGENT_RESPONSE_FAILURE_SHORTTERM);
+			core_instance->agent->callbacks->respond(core_instance->agent, AST_CC_AGENT_RESPONSE_FAILURE_SHORTTERM);
 		}
 		ast_free(args);
 		cc_unref(core_instance, "Unref core instance from when it was found earlier");