diff options
author | David Vossel <dvossel@digium.com> | 2009-07-02 16:03:44 +0000 |
---|---|---|
committer | David Vossel <dvossel@digium.com> | 2009-07-02 16:03:44 +0000 |
commit | 48c9a85d91932390c9f841a0302f44517a122c17 (patch) | |
tree | 61c6fc0caa1ad2ae20031f0c7fb1e2f5e49feaa8 /include/asterisk | |
parent | d92d4d21d64ffc39e7450dc8a253f46ae87d2de6 (diff) |
Merged revisions 204681 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r204681 | dvossel | 2009-07-02 10:05:57 -0500 (Thu, 02 Jul 2009) | 14 lines
Improved mapping of extension states from combined device states.
This fixes a few issues with incorrect extension states and adds
a cli command, core show device2extenstate, to display all possible
state mappings.
(closes issue #15413)
Reported by: legart
Patches:
exten_helper.diff uploaded by dvossel (license 671)
Tested by: dvossel, legart, amilcar
Review: https://reviewboard.asterisk.org/r/301/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204710 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
-rw-r--r-- | include/asterisk/devicestate.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asterisk/devicestate.h b/include/asterisk/devicestate.h index 3226cfcaa..ff4cdd40b 100644 --- a/include/asterisk/devicestate.h +++ b/include/asterisk/devicestate.h @@ -58,6 +58,7 @@ enum ast_device_state { AST_DEVICE_RINGING, /*!< Device is ringing */ AST_DEVICE_RINGINUSE, /*!< Device is ringing *and* in use */ AST_DEVICE_ONHOLD, /*!< Device is on hold */ + AST_DEVICE_TOTAL, /*/ Total num of device states, used for testing */ }; /*! \brief Devicestate provider call back */ @@ -248,6 +249,15 @@ void ast_devstate_aggregate_add(struct ast_devstate_aggregate *agg, enum ast_dev enum ast_device_state ast_devstate_aggregate_result(struct ast_devstate_aggregate *agg); /*! + * \brief Map devstate to an extension state. + * + * \param[in] device state + * + * \return the extension state mapping. + */ +enum ast_extension_states ast_devstate_to_extenstate(enum ast_device_state devstate); + +/*! * \brief You shouldn't care about the contents of this struct * * This struct is only here so that it can be easily declared on the stack. |