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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404438 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/ari/resource_applications.h b/res/ari/resource_applications.h
index 6aebd07fd530bfb366fc4eaf6c2de3b3c46f5fd9..a4d12c9c0745c74df7542a232ac4e06a8dcd9690 100644 (file)
--- a/res/ari/resource_applications.h
+++ b/res/ari/resource_applications.h
@@ -88,7 +88,7 @@ void ast_ari_applications_subscribe(struct ast_variable *headers, struct ast_ari
 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;

diff --git a/res/res_stasis_device_state.c b/res/res_stasis_device_state.c
index e6d339107ca409081c96cba9a91756ff72ece0df..01b10d3ecae2246bd3a7e5a88653830aff20baa2 100644 (file)
--- a/res/res_stasis_device_state.c
+++ b/res/res_stasis_device_state.c
@@ -39,7 +39,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 /*! 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