[asterisk-commits] kmoore: branch kmoore/stasis-device_state r384324 - in /team/kmoore/stasis-de...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Fri Mar 29 08:54:59 2013
New Revision: 384324

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384324
Log:
Update for current trunk and fix a bug with distributed device state

Modified:
    team/kmoore/stasis-device_state/main/devicestate.c
    team/kmoore/stasis-device_state/res/res_jabber.c
    team/kmoore/stasis-device_state/res/res_xmpp.c
    team/kmoore/stasis-device_state/tests/test_devicestate.c

Modified: team/kmoore/stasis-device_state/main/devicestate.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-device_state/main/devicestate.c?view=diff&rev=384324&r1=384323&r2=384324
==============================================================================
--- team/kmoore/stasis-device_state/main/devicestate.c (original)
+++ team/kmoore/stasis-device_state/main/devicestate.c Fri Mar 29 08:54:59 2013
@@ -617,7 +617,7 @@
 	RAII_VAR(struct stasis_message *, new_aggregate_msg, NULL, ao2_cleanup);
 	RAII_VAR(struct stasis_device_state *, new_aggregate_state, NULL, ao2_cleanup);
 
-	if (stasis_cache_update() == stasis_message_type(msg)) {
+	if (stasis_cache_update_type() == stasis_message_type(msg)) {
 		struct stasis_cache_update *update = stasis_message_data(msg);
 		if (!update->new_snapshot) {
 			return;

Modified: team/kmoore/stasis-device_state/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-device_state/res/res_jabber.c?view=diff&rev=384324&r1=384323&r2=384324
==============================================================================
--- team/kmoore/stasis-device_state/res/res_jabber.c (original)
+++ team/kmoore/stasis-device_state/res/res_jabber.c Fri Mar 29 08:54:59 2013
@@ -3289,7 +3289,7 @@
 		return;
 	}
 
-	aji_publish_device_state(client, dev_state->device, ast_devstate2str(dev_state->state), dev_state->cachable);
+	aji_publish_device_state(client, dev_state->device, ast_devstate_str(dev_state->state), dev_state->cachable);
 }
 
 static int cached_devstate_cb(void *obj, void *arg, int flags)

Modified: team/kmoore/stasis-device_state/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-device_state/res/res_xmpp.c?view=diff&rev=384324&r1=384323&r2=384324
==============================================================================
--- team/kmoore/stasis-device_state/res/res_xmpp.c (original)
+++ team/kmoore/stasis-device_state/res/res_xmpp.c Fri Mar 29 08:54:59 2013
@@ -1367,7 +1367,7 @@
 		return;
 	}
 
-	xmpp_pubsub_publish_device_state(client, dev_state->device, ast_devstate2str(dev_state->state), dev_state->cachable);
+	xmpp_pubsub_publish_device_state(client, dev_state->device, ast_devstate_str(dev_state->state), dev_state->cachable);
 }
 
 /*!

Modified: team/kmoore/stasis-device_state/tests/test_devicestate.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-device_state/tests/test_devicestate.c?view=diff&rev=384324&r1=384323&r2=384324
==============================================================================
--- team/kmoore/stasis-device_state/tests/test_devicestate.c (original)
+++ team/kmoore/stasis-device_state/tests/test_devicestate.c Fri Mar 29 08:54:59 2013
@@ -438,10 +438,10 @@
 	ast_test_validate(test, NULL != device_msg_router);
 
 	ao2_ref(consumer, +1);
-	res = stasis_message_router_add(device_msg_router, stasis_cache_update(), consumer_exec, consumer);
+	res = stasis_message_router_add(device_msg_router, stasis_cache_update_type(), consumer_exec, consumer);
 	ast_test_validate(test, !res);
 
-	res = stasis_message_router_add(device_msg_router, stasis_subscription_change(), consumer_finalize, consumer);
+	res = stasis_message_router_add(device_msg_router, stasis_subscription_change_type(), consumer_finalize, consumer);
 	ast_test_validate(test, !res);
 
 	/* push local state */