diff options
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/main/manager.c b/main/manager.c index e0d9f1d02..c92297398 100644 --- a/main/manager.c +++ b/main/manager.c @@ -3292,7 +3292,7 @@ static char *contenttype[] = { * the value of the mansession_id cookie (0 is not valid and means * a session on the AMI socket). */ -static struct mansession *find_session(uint32_t ident) +static struct mansession *find_session(uint32_t ident, int incinuse) { struct mansession *s; @@ -3303,7 +3303,7 @@ static struct mansession *find_session(uint32_t ident) AST_LIST_TRAVERSE(&sessions, s, list) { ast_mutex_lock(&s->__lock); if (s->managerid == ident && !s->needdestroy) { - ast_atomic_fetchadd_int(&s->inuse, 1); + ast_atomic_fetchadd_int(&s->inuse, incinuse ? 1 : 0); break; } ast_mutex_unlock(&s->__lock); @@ -3313,6 +3313,21 @@ static struct mansession *find_session(uint32_t ident) return s; } +int astman_is_authed(uint32_t ident) +{ + int authed; + struct mansession *s; + + if (!(s = find_session(ident, 0))) + return 0; + + authed = (s->authenticated != 0); + + ast_mutex_unlock(&s->__lock); + + return authed; +} + int astman_verify_session_readpermissions(uint32_t ident, int perm) { int result = 0; @@ -3603,7 +3618,7 @@ static struct ast_str *generic_http_callback(enum output_format format, } } - if (!(s = find_session(ident))) { + if (!(s = find_session(ident, 1))) { /* Create new session. * While it is not in the list we don't need any locking */ |