kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Protect the object from changing while the 'odbc show' CLI command is running

Browse Source 
(Closes issue #12704)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@118129 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-05-23 18:09:14 +00:00
parent 8f45823dda
commit ebb4ba3b9a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_odbc.c
View File

@@ -417,9 +417,11 @@ static char *handle_cli_odbc_show(struct ast_cli_entry *e, int cmd, struct ast_c
ast_cli(a->fd, " Pooled: Yes\n Limit: %d\n Connections in use: %d\n", class->limit, class->count);
while ((current = ao2_iterator_next(&aoi2))) {
ast_mutex_lock(&current->lock);
ast_cli(a->fd, " - Connection %d: %s\n", ++count,
current->used ? "in use" :
current->up && ast_odbc_sanity_check(current) ? "connected" : "disconnected");
ast_mutex_unlock(&current->lock);
ao2_ref(current, -1);
}
} else {
@@ -497,7 +499,9 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check)
aoi = ao2_iterator_init(class->obj_container, 0);
while ((obj = ao2_iterator_next(&aoi))) {
if (! obj->used) {
ast_mutex_lock(&obj->lock);
obj->used = 1;
ast_mutex_unlock(&obj->lock);
break;
}
ao2_ref(obj, -1);