diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c index 8c4d63c33c..b890e49b14 100644 --- a/res/res_config_pgsql.c +++ b/res/res_config_pgsql.c @@ -24,7 +24,7 @@ #include #include -#include /* PostgreSQL */ +#include /* PostgreSQL */ #include "asterisk.h" @@ -44,16 +44,20 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static char *res_config_pgsql_desc = "Postgresql RealTime Configuration Driver"; AST_MUTEX_DEFINE_STATIC(pgsql_lock); + #define RES_CONFIG_PGSQL_CONF "res_pgsql.conf" -PGconn* pgsqlConn = NULL; + +PGconn *pgsqlConn = NULL; + #define MAX_DB_OPTION_SIZE 64 -static char dbhost[MAX_DB_OPTION_SIZE]=""; -static char dbuser[MAX_DB_OPTION_SIZE]=""; -static char dbpass[MAX_DB_OPTION_SIZE]=""; -static char dbname[MAX_DB_OPTION_SIZE]=""; -static char dbsock[MAX_DB_OPTION_SIZE]=""; -static int dbport=5432; -static time_t connect_time=0; + +static char dbhost[MAX_DB_OPTION_SIZE] = ""; +static char dbuser[MAX_DB_OPTION_SIZE] = ""; +static char dbpass[MAX_DB_OPTION_SIZE] = ""; +static char dbname[MAX_DB_OPTION_SIZE] = ""; +static char dbsock[MAX_DB_OPTION_SIZE] = ""; +static int dbport = 5432; +static time_t connect_time = 0; static int parse_config(void); static int pgsql_reconnect(const char *database); @@ -62,12 +66,14 @@ static int realtime_pgsql_status(int fd, int argc, char **argv); LOCAL_USER_DECL; static char cli_realtime_pgsql_status_usage[] = -"Usage: realtime pgsql status\n" -" Shows connection information for the Postgresql RealTime driver\n"; + "Usage: realtime pgsql status\n" + " Shows connection information for the Postgresql RealTime driver\n"; static struct ast_cli_entry cli_realtime_pgsql_status = { - { "realtime", "pgsql", "status", NULL }, realtime_pgsql_status, - "Shows connection information for the Postgresql RealTime driver", cli_realtime_pgsql_status_usage, NULL }; + { "realtime", "pgsql", "status", NULL }, realtime_pgsql_status, + "Shows connection information for the Postgresql RealTime driver", + cli_realtime_pgsql_status_usage, NULL + }; static struct ast_variable *realtime_pgsql(const char *database, const char *table, va_list ap) { @@ -78,9 +84,9 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab char *chunk; char *op; const char *newparam, *newval; - struct ast_variable *var=NULL, *prev=NULL; + struct ast_variable *var = NULL, *prev = NULL; - if(!table) { + if (!table) { ast_log(LOG_WARNING, "Postgresql RealTime: No table specified.\n"); return NULL; } @@ -88,98 +94,105 @@ static struct ast_variable *realtime_pgsql(const char *database, const char *tab /* Get the first parameter and first value in our list of passed paramater/value pairs */ newparam = va_arg(ap, const char *); newval = va_arg(ap, const char *); - if(!newparam || !newval) { - ast_log(LOG_WARNING, "Postgresql RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n"); - if (pgsqlConn) - { - PQfinish(pgsqlConn); - pgsqlConn=NULL; - }; + if (!newparam || !newval) { + ast_log(LOG_WARNING, + "Postgresql RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n"); + if (pgsqlConn) { + PQfinish(pgsqlConn); + pgsqlConn = NULL; + }; return NULL; } /* Create the first part of the query using the first parameter/value pairs we just extracted If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */ - op = strchr(newparam, ' ')?"":" ="; + op = strchr(newparam, ' ') ? "" : " ="; - snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE %s%s '%s'", table, newparam, op, newval); - while((newparam = va_arg(ap, const char *))) { + snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE %s%s '%s'", table, newparam, op, + newval); + while ((newparam = va_arg(ap, const char *))) { newval = va_arg(ap, const char *); - if(!strchr(newparam, ' ')) op = " ="; else op = ""; - snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " AND %s%s '%s'", newparam, op, newval); + if (!strchr(newparam, ' ')) + op = " ="; + else + op = ""; + snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " AND %s%s '%s'", newparam, + op, newval); } va_end(ap); /* We now have our complete statement; Lets connect to the server and execute it. */ ast_mutex_lock(&pgsql_lock); - if(!pgsql_reconnect(database)) { + if (!pgsql_reconnect(database)) { ast_mutex_unlock(&pgsql_lock); return NULL; } - - if(!(result=PQexec(pgsqlConn, sql))) { - ast_log(LOG_WARNING, "Postgresql RealTime: Failed to query database. Check debug for more info.\n"); + + if (!(result = PQexec(pgsqlConn, sql))) { + ast_log(LOG_WARNING, + "Postgresql RealTime: Failed to query database. Check debug for more info.\n"); ast_log(LOG_DEBUG, "Postgresql RealTime: Query: %s\n", sql); - ast_log(LOG_DEBUG, "Postgresql RealTime: Query Failed because: %s\n", PQerrorMessage(pgsqlConn)); + ast_log(LOG_DEBUG, "Postgresql RealTime: Query Failed because: %s\n", + PQerrorMessage(pgsqlConn)); ast_mutex_unlock(&pgsql_lock); return NULL; + } else { + ExecStatusType result_status = PQresultStatus(result); + if (result_status != PGRES_COMMAND_OK + && result_status != PGRES_TUPLES_OK + && result_status != PGRES_NONFATAL_ERROR) { + ast_log(LOG_WARNING, + "Postgresql RealTime: Failed to query database. Check debug for more info.\n"); + ast_log(LOG_DEBUG, "Postgresql RealTime: Query: %s\n", sql); + ast_log(LOG_DEBUG, "Postgresql RealTime: Query Failed because: %s (%s)\n", + PQresultErrorMessage(result), PQresStatus(result_status)); + ast_mutex_unlock(&pgsql_lock); + return NULL; + } } - else { - ExecStatusType result_status=PQresultStatus(result); - if (result_status!=PGRES_COMMAND_OK - && result_status!=PGRES_TUPLES_OK - && result_status!=PGRES_NONFATAL_ERROR) - { - ast_log(LOG_WARNING, "Postgresql RealTime: Failed to query database. Check debug for more info.\n"); - ast_log(LOG_DEBUG, "Postgresql RealTime: Query: %s\n", sql); - ast_log(LOG_DEBUG, "Postgresql RealTime: Query Failed because: %s (%s)\n", - PQresultErrorMessage(result),PQresStatus(result_status)); - ast_mutex_unlock(&pgsql_lock); - return NULL; - } - } - + ast_log(LOG_DEBUG, "1Postgresql RealTime: Result=%p Query: %s\n", result, sql); - if((num_rows=PQntuples(result))>0) { - int i = 0; - int rowIndex=0; - int numFields = PQnfields(result); - char** fieldnames=NULL; + if ((num_rows = PQntuples(result)) > 0) { + int i = 0; + int rowIndex = 0; + int numFields = PQnfields(result); + char **fieldnames = NULL; - ast_log(LOG_DEBUG, "Postgresql RealTime: Found %d rows.\n", num_rows); + ast_log(LOG_DEBUG, "Postgresql RealTime: Found %d rows.\n", num_rows); - fieldnames=malloc(numFields*sizeof(char*)); - if (!fieldnames) { - /* If I can't alloc memory at this point, why bother doing anything else? */ - ast_log(LOG_WARNING, "Out of memory!\n"); - ast_mutex_unlock(&pgsql_lock); - PQclear(result); - return NULL; - } - for(i = 0; i < numFields; i++) - fieldnames[i]=PQfname(result,i); - for(rowIndex = 0; rowIndex < num_rows; rowIndex++) { - for(i = 0; i < numFields; i++) { - stringp = PQgetvalue(result,rowIndex,i); - while(stringp) { - chunk = strsep(&stringp, ";"); - if(chunk && !ast_strlen_zero(ast_strip(chunk))) { - if(prev) { - prev->next = ast_variable_new(fieldnames[i], chunk); - if (prev->next) { - prev = prev->next; - } - } else { - prev = var = ast_variable_new(fieldnames[i], chunk); - } - } + fieldnames = malloc(numFields * sizeof(char *)); + if (!fieldnames) { + /* If I can't alloc memory at this point, why bother doing anything else? */ + ast_log(LOG_WARNING, "Out of memory!\n"); + ast_mutex_unlock(&pgsql_lock); + PQclear(result); + return NULL; } - } - } - free(fieldnames); - } else { - ast_log(LOG_WARNING, "Postgresql RealTime: Could not find any rows in table %s.\n", table); + for (i = 0; i < numFields; i++) + fieldnames[i] = PQfname(result, i); + for (rowIndex = 0; rowIndex < num_rows; rowIndex++) { + for (i = 0; i < numFields; i++) { + stringp = PQgetvalue(result, rowIndex, i); + while (stringp) { + chunk = strsep(&stringp, ";"); + if (chunk && !ast_strlen_zero(ast_strip(chunk))) { + if (prev) { + prev->next = ast_variable_new(fieldnames[i], chunk); + if (prev->next) { + prev = prev->next; + } + } else { + prev = var = ast_variable_new(fieldnames[i], chunk); + } + } + } + } + } + free(fieldnames); + } else { + ast_log(LOG_WARNING, + "Postgresql RealTime: Could not find any rows in table %s.\n", table); } ast_mutex_unlock(&pgsql_lock); @@ -199,15 +212,15 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char char *op; const char *newparam, *newval; struct ast_realloca ra; - struct ast_variable *var=NULL; + struct ast_variable *var = NULL; struct ast_config *cfg = NULL; struct ast_category *cat = NULL; - if(!table) { + if (!table) { ast_log(LOG_WARNING, "Postgresql RealTime: No table specified.\n"); return NULL; } - + memset(&ra, 0, sizeof(ra)); cfg = ast_config_new(); @@ -220,34 +233,42 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char /* Get the first parameter and first value in our list of passed paramater/value pairs */ newparam = va_arg(ap, const char *); newval = va_arg(ap, const char *); - if(!newparam || !newval) { - ast_log(LOG_WARNING, "Postgresql RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n"); - if (pgsqlConn) - { - PQfinish(pgsqlConn); - pgsqlConn=NULL; - }; + if (!newparam || !newval) { + ast_log(LOG_WARNING, + "Postgresql RealTime: Realtime retrieval requires at least 1 parameter and 1 value to search on.\n"); + if (pgsqlConn) { + PQfinish(pgsqlConn); + pgsqlConn = NULL; + }; return NULL; } initfield = ast_strdupa(newparam); - if(initfield && (op = strchr(initfield, ' '))) { + if (initfield && (op = strchr(initfield, ' '))) { *op = '\0'; } /* Create the first part of the query using the first parameter/value pairs we just extracted If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */ - if(!strchr(newparam, ' ')) op = " ="; else op = ""; + if (!strchr(newparam, ' ')) + op = " ="; + else + op = ""; - snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE %s%s '%s'", table, newparam, op, newval); - while((newparam = va_arg(ap, const char *))) { + snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE %s%s '%s'", table, newparam, op, + newval); + while ((newparam = va_arg(ap, const char *))) { newval = va_arg(ap, const char *); - if(!strchr(newparam, ' ')) op = " ="; else op = ""; - snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " AND %s%s '%s'", newparam, op, newval); + if (!strchr(newparam, ' ')) + op = " ="; + else + op = ""; + snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " AND %s%s '%s'", newparam, + op, newval); } - if(initfield) { + if (initfield) { snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " ORDER BY %s", initfield); } @@ -255,80 +276,81 @@ static struct ast_config *realtime_multi_pgsql(const char *database, const char /* We now have our complete statement; Lets connect to the server and execute it. */ ast_mutex_lock(&pgsql_lock); - if(!pgsql_reconnect(database)) { + if (!pgsql_reconnect(database)) { ast_mutex_unlock(&pgsql_lock); return NULL; } - if(!(result=PQexec(pgsqlConn, sql))) { - ast_log(LOG_WARNING, "Postgresql RealTime: Failed to query database. Check debug for more info.\n"); + if (!(result = PQexec(pgsqlConn, sql))) { + ast_log(LOG_WARNING, + "Postgresql RealTime: Failed to query database. Check debug for more info.\n"); ast_log(LOG_DEBUG, "Postgresql RealTime: Query: %s\n", sql); - ast_log(LOG_DEBUG, "Postgresql RealTime: Query Failed because: %s\n", PQerrorMessage(pgsqlConn)); + ast_log(LOG_DEBUG, "Postgresql RealTime: Query Failed because: %s\n", + PQerrorMessage(pgsqlConn)); ast_mutex_unlock(&pgsql_lock); return NULL; - } - else { - ExecStatusType result_status=PQresultStatus(result); - if (result_status!=PGRES_COMMAND_OK - && result_status!=PGRES_TUPLES_OK - && result_status!=PGRES_NONFATAL_ERROR) - { - ast_log(LOG_WARNING, "Postgresql RealTime: Failed to query database. Check debug for more info.\n"); - ast_log(LOG_DEBUG, "Postgresql RealTime: Query: %s\n", sql); - ast_log(LOG_DEBUG, "Postgresql RealTime: Query Failed because: %s (%s)\n", - PQresultErrorMessage(result),PQresStatus(result_status)); - ast_mutex_unlock(&pgsql_lock); - return NULL; - } + } else { + ExecStatusType result_status = PQresultStatus(result); + if (result_status != PGRES_COMMAND_OK + && result_status != PGRES_TUPLES_OK + && result_status != PGRES_NONFATAL_ERROR) { + ast_log(LOG_WARNING, + "Postgresql RealTime: Failed to query database. Check debug for more info.\n"); + ast_log(LOG_DEBUG, "Postgresql RealTime: Query: %s\n", sql); + ast_log(LOG_DEBUG, "Postgresql RealTime: Query Failed because: %s (%s)\n", + PQresultErrorMessage(result), PQresStatus(result_status)); + ast_mutex_unlock(&pgsql_lock); + return NULL; + } } ast_log(LOG_DEBUG, "2Postgresql RealTime: Result=%p Query: %s\n", result, sql); - if((num_rows=PQntuples(result))>0) { - int numFields = PQnfields(result); - int i = 0; - int rowIndex=0; - char** fieldnames=NULL; + if ((num_rows = PQntuples(result)) > 0) { + int numFields = PQnfields(result); + int i = 0; + int rowIndex = 0; + char **fieldnames = NULL; - ast_log(LOG_DEBUG, "Postgresql RealTime: Found %d rows.\n", num_rows); - - fieldnames=malloc(numFields*sizeof(char*)); - if (!fieldnames) { - /* If I can't alloc memory at this point, why bother doing anything else? */ - ast_log(LOG_WARNING, "Out of memory!\n"); - ast_mutex_unlock(&pgsql_lock); - PQclear(result); - return NULL; - } - for(i = 0; i < numFields; i++) - fieldnames[i]=PQfname(result,i); + ast_log(LOG_DEBUG, "Postgresql RealTime: Found %d rows.\n", num_rows); - for(rowIndex=0;rowIndex= 0) - return (int)numrows; + if (numrows >= 0) + return (int) numrows; return -1; } -static struct ast_config *config_pgsql(const char *database, const char *table, const char *file, struct ast_config *cfg) +static struct ast_config *config_pgsql(const char *database, const char *table, + const char *file, struct ast_config *cfg) { PGresult *result = NULL; long num_rows; @@ -433,70 +461,72 @@ static struct ast_config *config_pgsql(const char *database, const char *table, last[0] = '\0'; - if(!file || !strcmp(file, RES_CONFIG_PGSQL_CONF)) { + if (!file || !strcmp(file, RES_CONFIG_PGSQL_CONF)) { ast_log(LOG_WARNING, "Postgresql RealTime: Cannot configure myself.\n"); return NULL; } - snprintf(sql, sizeof(sql), "SELECT category, var_name, var_val, cat_metric FROM %s WHERE filename='%s' and commented=0 ORDER BY filename, cat_metric desc, var_metric asc, category, var_name, var_val, id", table, file); + snprintf(sql, sizeof(sql), + "SELECT category, var_name, var_val, cat_metric FROM %s WHERE filename='%s' and commented=0 ORDER BY filename, cat_metric desc, var_metric asc, category, var_name, var_val, id", + table, file); ast_log(LOG_DEBUG, "Postgresql RealTime: Static SQL: %s\n", sql); /* We now have our complete statement; Lets connect to the server and execute it. */ ast_mutex_lock(&pgsql_lock); - if(!pgsql_reconnect(database)) { + if (!pgsql_reconnect(database)) { ast_mutex_unlock(&pgsql_lock); return NULL; } - if(!(result=PQexec(pgsqlConn, sql))) { - ast_log(LOG_WARNING, "Postgresql RealTime: Failed to query database. Check debug for more info.\n"); + if (!(result = PQexec(pgsqlConn, sql))) { + ast_log(LOG_WARNING, + "Postgresql RealTime: Failed to query database. Check debug for more info.\n"); ast_log(LOG_DEBUG, "Postgresql RealTime: Query: %s\n", sql); - ast_log(LOG_DEBUG, "Postgresql RealTime: Query Failed because: %s\n", PQerrorMessage(pgsqlConn)); + ast_log(LOG_DEBUG, "Postgresql RealTime: Query Failed because: %s\n", + PQerrorMessage(pgsqlConn)); ast_mutex_unlock(&pgsql_lock); return NULL; - } - else { - ExecStatusType result_status=PQresultStatus(result); - if (result_status!=PGRES_COMMAND_OK - && result_status!=PGRES_TUPLES_OK - && result_status!=PGRES_NONFATAL_ERROR) - { - ast_log(LOG_WARNING, "Postgresql RealTime: Failed to query database. Check debug for more info.\n"); - ast_log(LOG_DEBUG, "Postgresql RealTime: Query: %s\n", sql); - ast_log(LOG_DEBUG, "Postgresql RealTime: Query Failed because: %s (%s)\n", - PQresultErrorMessage(result),PQresStatus(result_status)); - ast_mutex_unlock(&pgsql_lock); - return NULL; - } + } else { + ExecStatusType result_status = PQresultStatus(result); + if (result_status != PGRES_COMMAND_OK + && result_status != PGRES_TUPLES_OK + && result_status != PGRES_NONFATAL_ERROR) { + ast_log(LOG_WARNING, + "Postgresql RealTime: Failed to query database. Check debug for more info.\n"); + ast_log(LOG_DEBUG, "Postgresql RealTime: Query: %s\n", sql); + ast_log(LOG_DEBUG, "Postgresql RealTime: Query Failed because: %s (%s)\n", + PQresultErrorMessage(result), PQresStatus(result_status)); + ast_mutex_unlock(&pgsql_lock); + return NULL; + } } - if((num_rows=PQntuples(result))>0) { - int numFields = PQnfields(result); - int i = 0; - int rowIndex=0; - char** fieldnames=NULL; + if ((num_rows = PQntuples(result)) > 0) { + int numFields = PQnfields(result); + int i = 0; + int rowIndex = 0; + char **fieldnames = NULL; - ast_log(LOG_DEBUG, "Postgresql RealTime: Found %ld rows.\n", num_rows); - - fieldnames=malloc(numFields*sizeof(char*)); - if (!fieldnames) { - /* If I can't alloc memory at this point, why bother doing anything else? */ - ast_log(LOG_WARNING, "Out of memory!\n"); - ast_mutex_unlock(&pgsql_lock); - PQclear(result); - return NULL; - } - for(i = 0; i < numFields; i++) - fieldnames[i]=PQfname(result,i); + ast_log(LOG_DEBUG, "Postgresql RealTime: Found %ld rows.\n", num_rows); - for(rowIndex=0;rowIndex 31536000) { - ast_cli(fd, "%s%s for %d years, %d days, %d hours, %d minutes, %d seconds.\n", status, status2, ctime / 31536000, (ctime % 31536000) / 86400, (ctime % 86400) / 3600, (ctime % 3600) / 60, ctime % 60); + ast_cli(fd, "%s%s for %d years, %d days, %d hours, %d minutes, %d seconds.\n", + status, status2, ctime / 31536000, (ctime % 31536000) / 86400, + (ctime % 86400) / 3600, (ctime % 3600) / 60, ctime % 60); } else if (ctime > 86400) { - ast_cli(fd, "%s%s for %d days, %d hours, %d minutes, %d seconds.\n", status, status2, ctime / 86400, (ctime % 86400) / 3600, (ctime % 3600) / 60, ctime % 60); + ast_cli(fd, "%s%s for %d days, %d hours, %d minutes, %d seconds.\n", status, + status2, ctime / 86400, (ctime % 86400) / 3600, (ctime % 3600) / 60, + ctime % 60); } else if (ctime > 3600) { - ast_cli(fd, "%s%s for %d hours, %d minutes, %d seconds.\n", status, status2, ctime / 3600, (ctime % 3600) / 60, ctime % 60); + ast_cli(fd, "%s%s for %d hours, %d minutes, %d seconds.\n", status, status2, + ctime / 3600, (ctime % 3600) / 60, ctime % 60); } else if (ctime > 60) { - ast_cli(fd, "%s%s for %d minutes, %d seconds.\n", status, status2, ctime / 60, ctime % 60); + ast_cli(fd, "%s%s for %d minutes, %d seconds.\n", status, status2, ctime / 60, + ctime % 60); } else { ast_cli(fd, "%s%s for %d seconds.\n", status, status2, ctime); }