--- mqtt/src/accmqtt.c 2011/11/24 01:13:27 1.1.2.4 +++ mqtt/src/accmqtt.c 2011/12/14 12:45:30 1.1.2.7 @@ -1,6 +1,9 @@ #include "global.h" +extern const char sql_schema[]; + + /* * mqtt_rtlm_log() Log database connection message * @@ -36,18 +39,26 @@ mqtt_rtlm_open(sl_config *cfg) if (!cfg) return NULL; + if (!sqlite3_threadsafe() || sqlite3_config(SQLITE_CONFIG_SERIALIZED)) + return NULL; + str = (const char*) cfg_GetAttribute(cfg, CFG("mqtt_acc"), CFG("name")); if (!str) { mqtt_rtlm_log("Error:: Unknown database name ...\n"); return NULL; } - if (sqlite3_open_v2(str, &sql, SQLITE_OPEN_READONLY, NULL)) { + if (sqlite3_open_v2(str, &sql, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL)) { MQTT_RTLM_LOG(sql); sqlite3_close(sql); return NULL; } + if (sqlite3_exec(sql, sql_schema, NULL, NULL, NULL)) { + MQTT_RTLM_LOG(sql); + sqlite3_close(sql); + return NULL; + } return sql; } @@ -70,11 +81,10 @@ mqtt_rtlm_close(sqlite3 *sql) * @sql = SQL handle * @user = username * @pass = password - * @... = arguments list * return: -1 error, 0 ALLOW and 1 REJECT */ int -mqtt_rtlm_login(sl_config *cfg, sqlite3 *sql, const char *user, const char *pass, ...) +mqtt_rtlm_login(sl_config *cfg, sqlite3 *sql, const char *user, const char *pass) { /* insert into Users values (NULL, "", "", 1, strftime('%s','now')); */ int ret = 0;