[svn-commits] seanbright: branch group/newcdr r202103 - /team/group/newcdr/cel/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Jun 19 18:29:43 CDT 2009
Author: seanbright
Date: Fri Jun 19 18:29:40 2009
New Revision: 202103
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=202103
Log:
Bring cel_sqlite3_custom in line with the escaping changes made its CDR sibling.
Modified:
team/group/newcdr/cel/cel_sqlite3_custom.c
Modified: team/group/newcdr/cel/cel_sqlite3_custom.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/group/newcdr/cel/cel_sqlite3_custom.c?view=diff&rev=202103&r1=202102&r2=202103
==============================================================================
--- team/group/newcdr/cel/cel_sqlite3_custom.c (original)
+++ team/group/newcdr/cel/cel_sqlite3_custom.c Fri Jun 19 18:29:40 2009
@@ -23,10 +23,10 @@
*
* \author Adapted by Steve Murphy <murf at digium.com> from
* Alejandro Rios <alejandro.rios at avatar.com.co> and
- * Russell Bryant <russell at digium.com> from
- * cel_mysql_custom by Edward Eastman <ed at dm3.co.uk>,
- * and cel_sqlite by Holger Schurig <hs4233 at mail.mn-solutions.de>
- *
+ * Russell Bryant <russell at digium.com> from
+ * cdr_mysql_custom by Edward Eastman <ed at dm3.co.uk>,
+ * and cdr_sqlite by Holger Schurig <hs4233 at mail.mn-solutions.de>
+ *
*
* \arg See also \ref AstCEL
*
@@ -42,13 +42,6 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <time.h>
-#include <sys/types.h>
#include <sqlite3.h>
#include "asterisk/paths.h"
@@ -67,204 +60,297 @@
static const char config_file[] = "cel_sqlite3_custom.conf";
-static char *name = "cel_sqlite3_custom";
+static const char name[] = "cel_sqlite3_custom";
static sqlite3 *db = NULL;
static char table[80];
-static char columns[1024];
-static char values[1024];
+static char *columns;
static struct ast_event_sub *event_sub = 0;
+struct values {
+ char *expression;
+ AST_LIST_ENTRY(values) list;
+};
+
+static AST_LIST_HEAD_STATIC(sql_values, values);
+
+static int free_config(void);
+
+static int load_column_config(const char *tmp)
+{
+ char *col = NULL;
+ char *cols = NULL, *save = NULL;
+ char *escaped = NULL;
+ struct ast_str *column_string = NULL;
+
+ if (ast_strlen_zero(tmp)) {
+ ast_log(LOG_WARNING, "Column names not specified. Module not loaded.\n");
+ return -1;
+ }
+ if (!(column_string = ast_str_create(1024))) {
+ ast_log(LOG_ERROR, "Out of memory creating temporary buffer for column list for table '%s.'\n", table);
+ return -1;
+ }
+ if (!(save = cols = ast_strdup(tmp))) {
+ ast_log(LOG_ERROR, "Out of memory creating temporary buffer for column list for table '%s.'\n", table);
+ ast_free(column_string);
+ return -1;
+ }
+ while ((col = strsep(&cols, ","))) {
+ col = ast_strip(col);
+ escaped = sqlite3_mprintf("%q", col);
+ if (!escaped) {
+ ast_log(LOG_ERROR, "Out of memory creating entry for column '%s' in table '%s.'\n", col, table);
+ ast_free(column_string);
+ ast_free(save);
+ return -1;
+ }
+ ast_str_append(&column_string, 0, "%s%s", ast_str_strlen(column_string) ? "," : "", escaped);
+ sqlite3_free(escaped);
+ }
+ if (!(columns = ast_strdup(ast_str_buffer(column_string)))) {
+ ast_log(LOG_ERROR, "Out of memory copying columns string for table '%s.'\n", table);
+ ast_free(column_string);
+ ast_free(save);
+ return -1;
+ }
+ ast_free(column_string);
+ ast_free(save);
+
+ return 0;
+}
+
+static int load_values_config(const char *tmp)
+{
+ char *val = NULL;
+ char *vals = NULL, *save = NULL;
+ struct values *value = NULL;
+
+ if (ast_strlen_zero(tmp)) {
+ ast_log(LOG_WARNING, "Values not specified. Module not loaded.\n");
+ return -1;
+ }
+ if (!(save = vals = ast_strdup(tmp))) {
+ ast_log(LOG_ERROR, "Out of memory creating temporary buffer for value '%s'\n", tmp);
+ return -1;
+ }
+ while ((val = strsep(&vals, ","))) {
+ /* Strip the single quotes off if they are there */
+ val = ast_strip_quoted(val, "'", "'");
+ value = ast_calloc(sizeof(char), sizeof(*value) + strlen(val) + 1);
+ if (!value) {
+ ast_log(LOG_ERROR, "Out of memory creating entry for value '%s'\n", val);
+ ast_free(save);
+ return -1;
+ }
+ value->expression = (char *) value + sizeof(*value);
+ ast_copy_string(value->expression, val, strlen(val) + 1);
+ AST_LIST_INSERT_TAIL(&sql_values, value, list);
+ }
+ ast_free(save);
+
+ return 0;
+}
+
static int load_config(int reload)
{
struct ast_config *cfg;
+ struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
struct ast_variable *mappingvar;
- struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
const char *tmp;
- if (!(cfg = ast_config_load(config_file, config_flags))) {
- if (reload) {
- ast_log(LOG_WARNING, "%s: Failed to reload configuration file.\n", name);
- } else {
- ast_log(LOG_WARNING,
- "%s: Failed to load configuration file. Module not activated.\n",
- name);
- }
- return AST_MODULE_LOAD_DECLINE;
- }
-
- if (!reload) {
- ast_mutex_lock(&lock);
- }
+ if ((cfg = ast_config_load(config_file, config_flags)) == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEINVALID) {
+ ast_log(LOG_WARNING, "Failed to %sload configuration file. %s\n",
+ reload ? "re" : "", reload ? "" : "Module not activated.");
+ return -1;
+ } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
+ return 0;
+ }
+
+ if (reload) {
+ free_config();
+ }
+
+ ast_mutex_lock(&lock);
if (!(mappingvar = ast_variable_browse(cfg, "master"))) {
- /* nothing configured */
+ /* Nothing configured */
+ ast_mutex_unlock(&lock);
ast_config_destroy(cfg);
- ast_log(LOG_WARNING, "%s: no mapping spec.\n", config_file);
- return AST_MODULE_LOAD_DECLINE;
+ return -1;
}
/* Mapping must have a table name */
- tmp = ast_variable_retrieve(cfg, "master", "table");
- if (!ast_strlen_zero(tmp)) {
+ if (!ast_strlen_zero(tmp = ast_variable_retrieve(cfg, "master", "table"))) {
ast_copy_string(table, tmp, sizeof(table));
} else {
- ast_log(LOG_WARNING, "%s: Table name not specified. Assuming cel.\n", name);
+ ast_log(LOG_WARNING, "Table name not specified. Assuming cel.\n");
strcpy(table, "cel");
}
- tmp = ast_variable_retrieve(cfg, "master", "columns");
- if (!ast_strlen_zero(tmp)) {
- ast_copy_string(columns, tmp, sizeof(columns));
- } else {
- ast_log(LOG_WARNING, "%s: Column names not specified. Module not loaded.\n",
- name);
+ /* Columns */
+ if (load_column_config(ast_variable_retrieve(cfg, "master", "columns"))) {
+ ast_mutex_unlock(&lock);
ast_config_destroy(cfg);
- return AST_MODULE_LOAD_DECLINE;
- }
-
- tmp = ast_variable_retrieve(cfg, "master", "values");
- if (!ast_strlen_zero(tmp)) {
- ast_copy_string(values, tmp, sizeof(values));
- } else {
- ast_log(LOG_WARNING, "%s: Values not specified. Module not loaded.\n", name);
+ free_config();
+ return -1;
+ }
+
+ /* Values */
+ if (load_values_config(ast_variable_retrieve(cfg, "master", "values"))) {
+ ast_mutex_unlock(&lock);
ast_config_destroy(cfg);
- return AST_MODULE_LOAD_DECLINE;
- }
-
- if (!reload) {
- ast_mutex_unlock(&lock);
- }
+ free_config();
+ return -1;
+ }
+
+ ast_verb(3, "Logging CEL records to table '%s' in 'master.db'\n", table);
+
+ ast_mutex_unlock(&lock);
ast_config_destroy(cfg);
- return AST_MODULE_LOAD_SUCCESS;
-}
-
-/* assumues 'to' buffer is at least strlen(from) * 2 + 1 bytes */
-static int do_escape(char *to, const char *from)
-{
- char *out = to;
-
- for (; *from; from++) {
- if (*from == '\'' || *from == '\\') {
- *out++ = *from;
- }
- *out++ = *from;
- }
- *out = '\0';
+ return 0;
+}
+
+static int free_config(void)
+{
+ struct values *value;
+
+ ast_mutex_lock(&lock);
+
+ if (db) {
+ sqlite3_close(db);
+ db = NULL;
+ }
+
+ if (columns) {
+ ast_free(columns);
+ columns = NULL;
+ }
+
+ while ((value = AST_LIST_REMOVE_HEAD(&sql_values, list))) {
+ ast_free(value);
+ }
+
+ ast_mutex_unlock(&lock);
return 0;
}
static void sqlite3_log(const struct ast_event *event, void *userdata)
{
- int res = 0;
- char *zErr = 0;
- char *sql_cmd;
- struct ast_channel *tchan;
- int count;
-
- ast_log(LOG_NOTICE,"Logging event to sqlite3 interface\n");
- tchan = ast_cel_fabricate_channel_from_event(event);
- if (!tchan) {
- ast_log(LOG_ERROR, "Unable to fabricate channel from CEL event\n");
+ char *error = NULL;
+ char *sql = NULL;
+ int count = 0;
+
+ if (db == NULL) {
+ /* Should not have loaded, but be failsafe. */
return;
}
- { /* Make it obvious that only sql_cmd should be used outside of this block */
- char *sql_tmp_cmd;
- char sql_insert_cmd[2048] = "";
- sql_tmp_cmd = sqlite3_mprintf("INSERT INTO %q (%q) VALUES (%q)", table, columns, values);
- pbx_substitute_variables_helper(tchan, sql_tmp_cmd, sql_insert_cmd, sizeof(sql_insert_cmd) - 1);
- sqlite3_free(sql_tmp_cmd);
- sql_cmd = alloca(strlen(sql_insert_cmd) * 2 + 1);
- do_escape(sql_cmd, sql_insert_cmd);
- }
-
- tchan = ast_channel_release(tchan);
+ { /* Make it obvious that only sql should be used outside of this block */
+ char *escaped;
+ char subst_buf[2048];
+ struct values *value;
+ struct ast_channel *dummy;
+ struct ast_str *value_string = ast_str_create(1024);
+
+ dummy = ast_cel_fabricate_channel_from_event(event);
+ if (!dummy) {
+ ast_log(LOG_ERROR, "Unable to fabricate channel from CEL event.\n");
+ ast_free(value_string);
+ return;
+ }
+ AST_LIST_TRAVERSE(&sql_values, value, list) {
+ pbx_substitute_variables_helper(dummy, value->expression, subst_buf, sizeof(subst_buf) - 1);
+ escaped = sqlite3_mprintf("%q", subst_buf);
+ ast_str_append(&value_string, 0, "%s'%s'", ast_str_strlen(value_string) ? "," : "", escaped);
+ sqlite3_free(escaped);
+ }
+ sql = sqlite3_mprintf("INSERT INTO %q (%s) VALUES (%s)", table, columns, ast_str_buffer(value_string));
+ ast_debug(1, "About to log: %s\n", sql);
+ dummy = ast_channel_release(dummy);
+ ast_free(value_string);
+ }
ast_mutex_lock(&lock);
+ /* XXX This seems awful arbitrary... */
for (count = 0; count < 5; count++) {
- res = sqlite3_exec(db, sql_cmd, NULL, NULL, &zErr);
+ int res = sqlite3_exec(db, sql, NULL, NULL, &error);
if (res != SQLITE_BUSY && res != SQLITE_LOCKED) {
break;
}
usleep(200);
}
- if (zErr) {
- ast_log(LOG_ERROR, "%s: %s. sentence: %s.\n", name, zErr, sql_cmd);
- sqlite3_free(zErr);
- }
-
ast_mutex_unlock(&lock);
+ if (error) {
+ ast_log(LOG_ERROR, "%s. SQL: %s.\n", error, sql);
+ sqlite3_free(error);
+ }
+
+ if (sql) {
+ sqlite3_free(sql);
+ }
+
return;
}
static int unload_module(void)
{
- if (db) {
- sqlite3_close(db);
- }
+ free_config();
if (event_sub) {
- ast_event_unsubscribe(event_sub);
- }
- event_sub = 0;
+ event_sub = ast_event_unsubscribe(event_sub);
+ }
return 0;
}
static int load_module(void)
{
- char *zErr;
- char fn[PATH_MAX];
+ char *error;
+ char filename[PATH_MAX];
int res;
- char *sql_cmd;
-
- if (load_config(0) != AST_MODULE_LOAD_SUCCESS) {
- ast_log(LOG_NOTICE,"CEL sqlite3 declining to load, config problem.\n");
+ char *sql;
+
+ if (!load_config(0)) {
+ event_sub = ast_event_subscribe(AST_EVENT_CEL, sqlite3_log, "CEL sqlite3 custom backend", NULL, AST_EVENT_IE_END);
+ if (!event_sub) {
+ ast_log(LOG_ERROR, "Unable to register custom SQLite3 CEL handling\n");
+ free_config();
+ return AST_MODULE_LOAD_DECLINE;
+ }
+ } else {
return AST_MODULE_LOAD_DECLINE;
}
/* is the database there? */
- snprintf(fn, sizeof(fn), "%s/master.db", ast_config_AST_LOG_DIR);
- res = sqlite3_open(fn, &db);
- if (!db) {
- ast_log(LOG_ERROR, "%s: Could not open database %s.\n", name, fn);
- sqlite3_free(zErr);
+ snprintf(filename, sizeof(filename), "%s/master.db", ast_config_AST_LOG_DIR);
+ res = sqlite3_open(filename, &db);
+ if (res != SQLITE_OK) {
+ ast_log(LOG_ERROR, "Could not open database %s.\n", filename);
+ free_config();
return AST_MODULE_LOAD_DECLINE;
}
/* is the table there? */
- sql_cmd = sqlite3_mprintf("SELECT COUNT(AcctId) FROM %q;", table);
- res = sqlite3_exec(db, sql_cmd, NULL, NULL, NULL);
- sqlite3_free(sql_cmd);
- if (res) {
- sql_cmd = sqlite3_mprintf("CREATE TABLE %q (AcctId INTEGER PRIMARY KEY,%q)", table, columns);
- res = sqlite3_exec(db, sql_cmd, NULL, NULL, &zErr);
- sqlite3_free(sql_cmd);
- if (zErr) {
- ast_log(LOG_WARNING, "%s: %s.\n", name, zErr);
- sqlite3_free(zErr);
+ sql = sqlite3_mprintf("SELECT COUNT(AcctId) FROM %q;", table);
+ res = sqlite3_exec(db, sql, NULL, NULL, NULL);
+ sqlite3_free(sql);
+ if (res != SQLITE_OK) {
+ /* We don't use %q for the column list here since we already escaped when building it */
+ sql = sqlite3_mprintf("CREATE TABLE %q (AcctId INTEGER PRIMARY KEY, %s)", table, columns);
+ res = sqlite3_exec(db, sql, NULL, NULL, &error);
+ sqlite3_free(sql);
+ if (res != SQLITE_OK) {
+ ast_log(LOG_WARNING, "Unable to create table '%s': %s.\n", table, error);
+ sqlite3_free(error);
+ free_config();
return AST_MODULE_LOAD_DECLINE;
}
-
- if (res) {
- ast_log(LOG_ERROR, "%s: Unable to create table '%s': %s.\n", name, table, zErr);
- sqlite3_free(zErr);
- if (db) {
- sqlite3_close(db);
- }
- return AST_MODULE_LOAD_DECLINE;
- }
- }
- event_sub = ast_event_subscribe(AST_EVENT_CEL, sqlite3_log, "CEL sqlist3_custom backend", NULL, AST_EVENT_IE_END);
- if (!event_sub) {
- ast_log(LOG_ERROR, "%s: Unable to register custom SQLite3 CEL handling\n", name);
- return AST_MODULE_LOAD_DECLINE;
}
return AST_MODULE_LOAD_SUCCESS;
@@ -272,13 +358,7 @@
static int reload(void)
{
- int res;
-
- ast_mutex_lock(&lock);
- res = load_config(1);
- ast_mutex_unlock(&lock);
-
- return res;
+ return load_config(1);
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "SQLite3 Custom CEL Module",
More information about the svn-commits
mailing list