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

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Sep  8 15:37:31 2009
New Revision: 217228

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=217228
Log:
* Make sure event subscription description is non-NULL
* Ensure that AST_EVENT_IE_END is at the end of event subscription

At this point, it appears that the process, up to CC subscription
works. Now, when the unavailable party becomes available again, things
don't go exactly as planned. I'll have to check that out more
thoroughly.


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

Modified: team/group/CCSS/main/ccss.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/CCSS/main/ccss.c?view=diff&rev=217228&r1=217227&r2=217228
==============================================================================
--- team/group/CCSS/main/ccss.c (original)
+++ team/group/CCSS/main/ccss.c Tue Sep  8 15:37:31 2009
@@ -776,7 +776,8 @@
 	if (!(generic_pvt->sub = ast_event_subscribe(
 			AST_EVENT_DEVICE_STATE, generic_devstate_cb, ast_str_buffer(str), agent, 
 			AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, agent->interface,
-			AST_EVENT_IE_STATE, AST_EVENT_IE_PLTYPE_UINT, AST_DEVICE_NOT_INUSE))) {
+			AST_EVENT_IE_STATE, AST_EVENT_IE_PLTYPE_UINT, AST_DEVICE_NOT_INUSE,
+			AST_EVENT_IE_END))) {
 		return -1;
 	}
 	return 0;
@@ -1472,9 +1473,10 @@
 	}
 
 	if (!(gen_mon_pvt->sub = ast_event_subscribe(
-			AST_EVENT_DEVICE_STATE, generic_monitor_devstate_cb, NULL, monitor, 
+			AST_EVENT_DEVICE_STATE, generic_monitor_devstate_cb, "Requesting CC", monitor, 
 			AST_EVENT_IE_DEVICE, AST_EVENT_IE_PLTYPE_STR, monitor->name,
-			AST_EVENT_IE_STATE, AST_EVENT_IE_PLTYPE_UINT, AST_DEVICE_NOT_INUSE))) {
+			AST_EVENT_IE_STATE, AST_EVENT_IE_PLTYPE_UINT, AST_DEVICE_NOT_INUSE,
+			AST_EVENT_IE_END))) {
 		return -1;
 	}
 	return 0;