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

update res_odbc to support pooled connections

Browse Source 
(from tilghman's developer branch, res_odbc_rewrite)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@21181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-04-18 18:16:32 +00:00
parent fc2d28805b
commit 501ac5189c
4 changed files with 587 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
funcs/func_odbc.c
View File

@@ -77,7 +77,7 @@ static void acf_odbc_error(SQLHSTMT stmt, int res)
*/
static int acf_odbc_write(struct ast_channel *chan, char *cmd, char *s, const char *value)
{
odbc_obj *obj;
struct odbc_obj *obj;
struct acf_odbc_query *query;
char *t, *arg, buf[2048]="", varname[15];
int res, argcount=0, valcount=0, i, retry=0;
@@ -104,10 +104,10 @@ static int acf_odbc_write(struct ast_channel *chan, char *cmd, char *s, const ch
return -1;
}
obj = fetch_odbc_obj(query->dsn, 0);
obj = odbc_request_obj(query->dsn, 0);
if (!obj) {
ast_log(LOG_ERROR, "No such DSN registered: %s (check res_odbc.conf)\n", query->dsn);
ast_log(LOG_ERROR, "No such DSN registered (or out of connections): %s (check res_odbc.conf)\n", query->dsn);
ast_mutex_unlock(&query_lock);
return -1;
}
@@ -204,9 +204,9 @@ retry_write:
}
}
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
odbc_obj_disconnect(obj);
odbc_release_obj(obj);
/* All handles are now invalid (after a disconnect), so we gotta redo all handles */
odbc_obj_connect(obj);
obj = odbc_request_obj("asterisk", 1);
if (!retry) {
retry = 1;
goto retry_write;
@@ -235,7 +235,7 @@ retry_write:
static int acf_odbc_read(struct ast_channel *chan, char *cmd, char *s, char *buf, size_t len)
{
odbc_obj *obj;
struct odbc_obj *obj;
struct acf_odbc_query *query;
char *arg, sql[2048] = "", varname[15];
int count=0, res, x;
@@ -260,10 +260,10 @@ static int acf_odbc_read(struct ast_channel *chan, char *cmd, char *s, char *buf
return -1;
}
obj = fetch_odbc_obj(query->dsn, 0);
obj = odbc_request_obj(query->dsn, 0);
if (!obj) {
ast_log(LOG_ERROR, "No such DSN registered: %s (check res_odbc.conf)\n", query->dsn);
ast_log(LOG_ERROR, "No such DSN registered (or out of connections): %s (check res_odbc.conf)\n", query->dsn);
ast_mutex_unlock(&query_lock);
return -1;
}
@@ -331,7 +331,7 @@ static int acf_odbc_read(struct ast_channel *chan, char *cmd, char *s, char *buf
goto acf_out;
}
for (x=0; x<colcount; x++) {
for (x = 0; x < colcount; x++) {
int buflen, coldatalen;
char coldata[256];