[asterisk-commits] mmichelson: branch group/CCSS r247903 - /team/group/CCSS/main/ccss.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Feb 19 10:43:23 2010
New Revision: 247903

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247903
Log:
Add a couple of new manager events and remove a redundant one.


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=247903&r1=247902&r2=247903
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Fri Feb 19 10:43:23 2010
@@ -2622,7 +2622,7 @@
 						monitor_iter->interface->device_name, 1);
 				cc_unref(monitor_iter, "request_cc failed. Unref list's reference to monitor");
 			} else {
-				manager_event(EVENT_FLAG_CC, "CCRequestSent",
+				manager_event(EVENT_FLAG_CC, "CCRequested",
 					"CoreID: %d\r\n"
 					"Caller: %s\r\n"
 					"Callee: %s\r\n",
@@ -2647,10 +2647,6 @@
 	}
 	core_instance->agent->callbacks->stop_offer_timer(core_instance->agent);
 	request_cc(core_instance);
-	manager_event(EVENT_FLAG_CC, "CCRequested",
-		"CoreID: %d\r\n"
-		"Caller: %s\r\n",
-		core_instance->core_id, core_instance->agent->device_name);
 	return 0;
 }
 
@@ -2686,7 +2682,9 @@
 	if (previous_state == CC_CALLER_REQUESTED) {
 		core_instance->agent->callbacks->ack(core_instance->agent);
 		manager_event(EVENT_FLAG_CC, "CCRequestAcknowledged",
-			"CoreID: %d\r\n", core_instance->core_id);
+			"CoreID: %d\r\n"
+			"Caller: %s\r\n",
+			core_instance->core_id, core_instance->agent->device_name);
 	} else if (previous_state == CC_CALLER_BUSY) {
 		manager_event(EVENT_FLAG_CC, "CCCallerStopMonitoring",
 			"CoreID: %d\r\n"
@@ -3419,6 +3417,10 @@
 				cc_extension_monitor_change_is_valid(core_instance, monitor_iter->parent_id,
 						monitor_iter->interface->device_name, 1);
 				monitor_iter->callbacks->cancel_available_timer(monitor_iter, &monitor_iter->available_timer_id);
+				manager_event(EVENT_FLAG_CC, "CCMonitorFailed",
+					"CoreID: %d\r\n"
+					"Callee: %s\r\n",
+					monitor_iter->core_id, monitor_iter->interface->device_name);
 				cc_unref(monitor_iter, "Monitor reported failure. Unref list's reference.");
 			}
 		}