[svn-commits] rmudgett: branch 10 r354959 - in /branches/10: ./ configs/ res/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Feb 13 11:24:05 CST 2012
Author: rmudgett
Date: Mon Feb 13 11:24:01 2012
New Revision: 354959
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=354959
Log:
Fix reconnecting to pgsql database after connection loss.
There can only be one database connection in res_config_pgsql just like
res_config_sqlite. If the connection is lost, the connection may not get
reestablished to the same database if the res_pgsql.conf and
extconfig.conf files are inconsistent.
* Made only use the configured database from res_pgsql.conf.
* Fixed potential buffer overwrite of last[] in config_pgsql().
(closes issue ASTERISK-16982)
Reported by: german aracil boned
Review: https://reviewboard.asterisk.org/r/1731/
........
Merged revisions 354953 from http://svn.asterisk.org/svn/asterisk/branches/1.8
Modified:
branches/10/ (props changed)
branches/10/configs/extconfig.conf.sample
branches/10/res/res_config_pgsql.c
Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Modified: branches/10/configs/extconfig.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/10/configs/extconfig.conf.sample?view=diff&rev=354959&r1=354958&r2=354959
==============================================================================
--- branches/10/configs/extconfig.conf.sample (original)
+++ branches/10/configs/extconfig.conf.sample Mon Feb 13 11:24:01 2012
@@ -61,6 +61,10 @@
; curl ... res_config_curl
; ldap ... res_config_ldap
;
+; Note: The res_config_pgsql and res_config_sqlite backends configure the
+; database used in their respective configuration files and ignore the
+; database name configured in this file.
+;
;iaxusers => odbc,asterisk
;iaxpeers => odbc,asterisk
;sippeers => odbc,asterisk
Modified: branches/10/res/res_config_pgsql.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/res/res_config_pgsql.c?view=diff&rev=354959&r1=354958&r2=354959
==============================================================================
--- branches/10/res/res_config_pgsql.c (original)
+++ branches/10/res/res_config_pgsql.c Mon Feb 13 11:24:01 2012
@@ -429,6 +429,12 @@
char *op;
const char *newparam, *newval;
struct ast_variable *var = NULL, *prev = NULL;
+
+ /*
+ * Ignore database from the extconfig.conf since it was
+ * configured by res_pgsql.conf.
+ */
+ database = dbname;
if (!tablename) {
ast_log(LOG_WARNING, "PostgreSQL RealTime: No table specified.\n");
@@ -548,6 +554,12 @@
struct ast_config *cfg = NULL;
struct ast_category *cat = NULL;
+ /*
+ * Ignore database from the extconfig.conf since it was
+ * configured by res_pgsql.conf.
+ */
+ database = dbname;
+
if (!table) {
ast_log(LOG_WARNING, "PostgreSQL RealTime: No table specified.\n");
return NULL;
@@ -700,6 +712,12 @@
struct tables *table;
struct columns *column = NULL;
+ /*
+ * Ignore database from the extconfig.conf since it was
+ * configured by res_pgsql.conf.
+ */
+ database = dbname;
+
if (!tablename) {
ast_log(LOG_WARNING, "PostgreSQL RealTime: No table specified.\n");
return -1;
@@ -830,6 +848,12 @@
struct ast_str *where = ast_str_thread_get(&where_buf, 100);
struct tables *table;
+ /*
+ * Ignore database from the extconfig.conf since it was
+ * configured by res_pgsql.conf.
+ */
+ database = dbname;
+
if (!tablename) {
ast_log(LOG_WARNING, "PostgreSQL RealTime: No table specified.\n");
return -1;
@@ -938,6 +962,12 @@
struct ast_str *sql2 = ast_str_thread_get(&where_buf, 256);
int pgresult;
const char *newparam, *newval;
+
+ /*
+ * Ignore database from the extconfig.conf since it was
+ * configured by res_pgsql.conf.
+ */
+ database = dbname;
if (!table) {
ast_log(LOG_WARNING, "PostgreSQL RealTime: No table specified.\n");
@@ -1014,6 +1044,12 @@
struct ast_str *buf1 = ast_str_thread_get(&where_buf, 60), *buf2 = ast_str_thread_get(&escapebuf_buf, 60);
const char *newparam, *newval;
+ /*
+ * Ignore database from the extconfig.conf since it was
+ * configured by res_pgsql.conf.
+ */
+ database = dbname;
+
if (!table) {
ast_log(LOG_WARNING, "PostgreSQL RealTime: No table specified.\n");
return -1;
@@ -1089,10 +1125,16 @@
struct ast_variable *new_v;
struct ast_category *cur_cat = NULL;
struct ast_str *sql = ast_str_thread_get(&sql_buf, 100);
- char last[80] = "";
+ char last[80];
int last_cat_metric = 0;
last[0] = '\0';
+
+ /*
+ * Ignore database from the extconfig.conf since it is
+ * configured by res_pgsql.conf.
+ */
+ database = dbname;
if (!file || !strcmp(file, RES_CONFIG_PGSQL_CONF)) {
ast_log(LOG_WARNING, "PostgreSQL RealTime: Cannot configure myself.\n");
@@ -1136,7 +1178,7 @@
cur_cat = ast_category_new(field_category, "", 99999);
if (!cur_cat)
break;
- strcpy(last, field_category);
+ ast_copy_string(last, field_category, sizeof(last));
last_cat_metric = atoi(field_cat_metric);
ast_category_append(cfg, cur_cat);
}
@@ -1157,10 +1199,17 @@
static int require_pgsql(const char *database, const char *tablename, va_list ap)
{
struct columns *column;
- struct tables *table = find_table(database, tablename);
+ struct tables *table;
char *elm;
int type, size, res = 0;
+ /*
+ * Ignore database from the extconfig.conf since it was
+ * configured by res_pgsql.conf.
+ */
+ database = dbname;
+
+ table = find_table(database, tablename);
if (!table) {
ast_log(LOG_WARNING, "Table %s not found in database. This table should exist if you're using realtime.\n", tablename);
return -1;
@@ -1283,6 +1332,13 @@
static int unload_pgsql(const char *database, const char *tablename)
{
struct tables *cur;
+
+ /*
+ * Ignore database from the extconfig.conf since it was
+ * configured by res_pgsql.conf.
+ */
+ database = dbname;
+
ast_debug(2, "About to lock table cache list\n");
AST_LIST_LOCK(&psql_tables);
ast_debug(2, "About to traverse table cache list\n");
@@ -1487,7 +1543,7 @@
/* DB password can legitimately be 0-length */
if ((!pgsqlConn) && (!ast_strlen_zero(dbhost) || !ast_strlen_zero(dbsock)) && !ast_strlen_zero(dbuser) && !ast_strlen_zero(my_database)) {
- struct ast_str *connInfo = ast_str_create(32);
+ struct ast_str *connInfo = ast_str_create(128);
ast_str_set(&connInfo, 0, "host=%s port=%d dbname=%s user=%s",
S_OR(dbhost, dbsock), dbport, my_database, dbuser);
@@ -1509,7 +1565,7 @@
} else {
ast_log(LOG_ERROR,
"PostgreSQL RealTime: Failed to connect database %s on %s: %s\n",
- dbname, dbhost, PQresultErrorMessage(NULL));
+ my_database, dbhost, PQresultErrorMessage(NULL));
return 0;
}
} else {
More information about the svn-commits
mailing list