kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 99341 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r99341 | tilghman | 2008-01-21 12:11:07 -0600 (Mon, 21 Jan 2008) | 8 lines

Permit the user to specify number of seconds that a connection may remain idle,
which fixes a crash on reconnect with the MyODBC driver.
(closes issue #11798)
 Reported by: Corydon76
 Patches: 
       20080119__res_odbc__idlecheck.diff.txt uploaded by Corydon76 (license 14)
 Tested by: mvanbaak

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-01-21 18:15:57 +00:00
parent 965c454543
commit 6181e386b5
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
res/res_odbc.c
View File

@@ -46,6 +46,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/cli.h"
#include "asterisk/lock.h"
#include "asterisk/res_odbc.h"
#include "asterisk/time.h"
struct odbc_class
{
@@ -61,6 +62,7 @@ struct odbc_class
unsigned int count:10; /* Running count of pooled connections */
unsigned int delme:1; /* Purge the class */
unsigned int backslash_is_escape:1; /* On this database, the backslash is a native escape sequence */
unsigned int idlecheck; /* Recheck the connection if it is idle for this long */
AST_LIST_HEAD(, odbc_obj) odbc_obj;
};
@@ -135,7 +137,8 @@ SQLHSTMT ast_odbc_prepare_and_execute(struct odbc_obj *obj, SQLHSTMT (*prepare_c
*/
ast_odbc_sanity_check(obj);
continue;
}
} else
obj->last_used = ast_tvnow();
break;
} else if (attempt == 0)
ast_odbc_sanity_check(obj);
@@ -180,7 +183,8 @@ int ast_odbc_smart_execute(struct odbc_obj *obj, SQLHSTMT stmt)
odbc_obj_connect(obj);
res = SQLExecute(stmt);
#endif
}
} else
obj->last_used = ast_tvnow();
return res;
}
@@ -229,6 +233,7 @@ static int load_odbc_config(void)
char *cat;
const char *dsn, *username, *password, *sanitysql;
int enabled, pooling, limit, bse;
unsigned int idlecheck;
int connect = 0, res = 0;
struct ast_flags config_flags = { 0 };
@@ -249,7 +254,7 @@ static int load_odbc_config(void)
/* Reset all to defaults for each class of odbc connections */
dsn = username = password = sanitysql = NULL;
enabled = 1;
connect = 0;
connect = idlecheck = 0;
pooling = 0;
limit = 0;
bse = 1;
@@ -267,6 +272,8 @@ static int load_odbc_config(void)
enabled = 0;
break;
}
} else if (!strcasecmp(v->name, "idlecheck")) {
sscanf(v->value, "%d", &idlecheck);
} else if (!strcasecmp(v->name, "enabled")) {
enabled = ast_true(v->value);
} else if (!strcasecmp(v->name, "pre-connect")) {
@@ -323,6 +330,7 @@ static int load_odbc_config(void)
}
new->backslash_is_escape = bse ? 1 : 0;
new->idlecheck = idlecheck;
odbc_register_class(new, connect);
ast_log(LOG_NOTICE, "Registered ODBC class '%s' dsn->[%s]\n", cat, dsn);
@@ -508,7 +516,9 @@ struct odbc_obj *ast_odbc_request_obj(const char *name, int check)
if (obj && check) {
ast_odbc_sanity_check(obj);
}
} else if (obj->parent->idlecheck > 0 && ast_tvdiff_ms(ast_tvnow(), obj->last_used) / 1000 > obj->parent->idlecheck)
odbc_obj_connect(obj);
return obj;
}
@@ -576,6 +586,7 @@ static odbc_status odbc_obj_connect(struct odbc_obj *obj)
} else {
ast_log(LOG_NOTICE, "res_odbc: Connected to %s [%s]\n", obj->parent->name, obj->parent->dsn);
obj->up = 1;
obj->last_used = ast_tvnow();
}
ast_mutex_unlock(&obj->lock);
@@ -590,6 +601,7 @@ static int reload(void)
char *cat;
const char *dsn, *username, *password, *sanitysql;
int enabled, pooling, limit, bse;
unsigned int idlecheck;
int connect = 0, res = 0;
struct ast_flags config_flags = { CONFIG_FLAG_FILEUNCHANGED };
@@ -615,7 +627,7 @@ static int reload(void)
/* Reset all to defaults for each class of odbc connections */
dsn = username = password = sanitysql = NULL;
enabled = 1;
connect = 0;
connect = idlecheck = 0;
pooling = 0;
limit = 0;
bse = 1;
@@ -632,6 +644,8 @@ static int reload(void)
enabled = 0;
break;
}
} else if (!strcasecmp(v->name, "idlecheck")) {
sscanf(v->value, "%ud", &idlecheck);
} else if (!strcasecmp(v->name, "enabled")) {
enabled = ast_true(v->value);
} else if (!strcasecmp(v->name, "pre-connect")) {
@@ -720,6 +734,7 @@ static int reload(void)
}
new->backslash_is_escape = bse;
new->idlecheck = idlecheck;
if (class) {
ast_log(LOG_NOTICE, "Refreshing ODBC class '%s' dsn->[%s]\n", cat, dsn);