diff options
Diffstat (limited to 'main/devicestate.c')
| -rw-r--r-- | main/devicestate.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/main/devicestate.c b/main/devicestate.c index 8c62b177c..10813c4c0 100644 --- a/main/devicestate.c +++ b/main/devicestate.c @@ -286,7 +286,7 @@ static enum ast_device_state devstate_cached(const char *device) } /*! \brief Check device state through channel specific function or generic function */ -enum ast_device_state ast_device_state(const char *device) +static enum ast_device_state _ast_device_state(const char *device, int check_cache) { char *buf; char *number; @@ -298,9 +298,12 @@ enum ast_device_state ast_device_state(const char *device) char *provider = NULL; /* If the last known state is cached, just return that */ - res = devstate_cached(device); - if (res != AST_DEVICE_UNKNOWN) - return res; + if (check_cache) { + res = devstate_cached(device); + if (res != AST_DEVICE_UNKNOWN) { + return res; + } + } buf = ast_strdupa(device); tech = strsep(&buf, "/"); @@ -338,6 +341,14 @@ enum ast_device_state ast_device_state(const char *device) return res; } +enum ast_device_state ast_device_state(const char *device) +{ + /* This function is called from elsewhere in the code to find out the + * current state of a device. Check the cache, first. */ + + return _ast_device_state(device, 1); +} + /*! \brief Add device state provider */ int ast_devstate_prov_add(const char *label, ast_devstate_prov_cb_type callback) { @@ -425,7 +436,7 @@ static void do_state_change(const char *device) { enum ast_device_state state; - state = ast_device_state(device); + state = _ast_device_state(device, 0); ast_debug(3, "Changing state for %s - state %d (%s)\n", device, state, devstate2str(state)); |