From: Matthew Jordan Date: Fri, 20 Dec 2013 20:05:40 +0000 (+0000) Subject: res_stasis_device_state: Set resource type for subscriptions to deviceState X-Git-Tag: 13.0.0-beta1~708 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ddfe12affea126d4cae0a2c75fac626cabbc496;p=thirdparty%2Fasterisk.git 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 6aebd07fd5..a4d12c9c07 100644 --- 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 e6d339107c..01b10d3eca 100644 --- 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