[asterisk-commits] mjordan: trunk r404438 - in /trunk: ./ res/ res/ari/

[SVN commits to the Asterisk project]

Author: mjordan
Date: Fri Dec 20 14:05:40 2013
New Revision: 404438

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=404438
Log:
res_stasis_device_state: Set resource type for subscriptions to deviceState

The documentation for ARI already specifies that the device state resource when
used for subscribing for events is "deviceState", not "device_state". The code,
however, used "device_state"; although this was inconsistent as well in doxygen
comments in resource_applications.

Because the actual resource being subscribed to is /deviceStates/{device}/, it
makes sense for the resource type specifier to be deviceState.

Note that the key value in the events is still "device_state".
........

Merged revisions 404437 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/ari/resource_applications.h
    trunk/res/res_stasis_device_state.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/ari/resource_applications.h
URL: http://svnview.digium.com/svn/asterisk/trunk/res/ari/resource_applications.h?view=diff&rev=404438&r1=404437&r2=404438
==============================================================================
--- trunk/res/ari/resource_applications.h (original)
+++ trunk/res/ari/resource_applications.h Fri Dec 20 14:05:40 2013
@@ -88,7 +88,7 @@
 struct ast_ari_applications_unsubscribe_args {
 	/*! \brief Application's name */
 	const char *application_name;
-	/*! \brief Array of URI for event source (channel:{channelId}, bridge:{bridgeId}, endpoint:{tech}/{resource}, device_state:{deviceName} */
+	/*! \brief Array of URI for event source (channel:{channelId}, bridge:{bridgeId}, endpoint:{tech}/{resource}, deviceState:{deviceName} */
 	const char **event_source;
 	/*! \brief Length of event_source array. */
 	size_t event_source_count;

Modified: trunk/res/res_stasis_device_state.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_stasis_device_state.c?view=diff&rev=404438&r1=404437&r2=404438
==============================================================================
--- trunk/res/res_stasis_device_state.c (original)
+++ trunk/res/res_stasis_device_state.c Fri Dec 20 14:05:40 2013
@@ -39,7 +39,7 @@
 /*! Scheme for custom device states */
 #define DEVICE_STATE_SCHEME_STASIS "Stasis:"
 /*! Scheme for device state subscriptions */
-#define DEVICE_STATE_SCHEME_SUB "device_state:"
+#define DEVICE_STATE_SCHEME_SUB "deviceState:"
 
 /*! Number of hash buckets for device state subscriptions */
 #define DEVICE_STATE_BUCKETS 37