--- mqtt/src/accmqtt.c	2011/12/12 09:24:25	1.1.2.6
+++ mqtt/src/accmqtt.c	2012/04/25 12:04:30	1.2.2.3
@@ -20,7 +20,8 @@ mqtt_rtlm_log(const char *fmt, ...)
 	vsyslog(LOG_ERR, fmt, lst);
 	va_end(lst);
 }
-#define MQTT_RTLM_LOG(_sql)	(assert((_sql)), mqtt_rtlm_log("Error:: SQL #%d - %s", \
+#define MQTT_RTLM_LOG(_sql)	(assert((_sql)), mqtt_rtlm_log("Error:: %s(%d) SQL #%d - %s", \
+					__func__, __LINE__, \
 					sqlite3_errcode((_sql)), sqlite3_errmsg((_sql))))
 
 
@@ -31,7 +32,7 @@ mqtt_rtlm_log(const char *fmt, ...)
  * return: NULL error or SQL handle
  */
 sqlite3 *
-mqtt_rtlm_open(sl_config *cfg)
+mqtt_rtlm_open(cfg_root_t *cfg)
 {
 	sqlite3 *sql = NULL;
 	const char *str = NULL;
@@ -40,8 +41,10 @@ mqtt_rtlm_open(sl_config *cfg)
 		return NULL;
 
 	sqlite3_config(SQLITE_CONFIG_SERIALIZED);
+	if (!sqlite3_threadsafe())
+		return NULL;
 
-	str = (const char*) cfg_GetAttribute(cfg, CFG("mqtt_acc"), CFG("name"));
+	str = (const char*) cfg_getAttribute(cfg, "mqtt_acc", "name");
 	if (!str) {
 		mqtt_rtlm_log("Error:: Unknown database name ...\n");
 		return NULL;
@@ -53,11 +56,14 @@ mqtt_rtlm_open(sl_config *cfg)
 		return NULL;
 	}
 
+	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_exec(sql, sql_schema, NULL, NULL, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		sqlite3_close(sql);
 		return NULL;
 	}
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 	return sql;
 }
 
@@ -83,7 +89,7 @@ mqtt_rtlm_close(sqlite3 *sql)
  * 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(cfg_root_t *cfg, sqlite3 *sql, const char *user, const char *pass)
 {
 	/* insert into Users values (NULL, "", "", 1, strftime('%s','now')); */
 	int ret = 0;
@@ -93,7 +99,7 @@ mqtt_rtlm_login(sl_config *cfg, sqlite3 *sql, const ch
 	if (!sql)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_acc"), CFG("tbl_users"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_acc", "tbl_users");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found users table name");
 		return -1;
@@ -101,8 +107,10 @@ mqtt_rtlm_login(sl_config *cfg, sqlite3 *sql, const ch
 	snprintf(szStmt, sizeof szStmt, "SELECT DISTINCT Username, Password, Access FROM %s "
 			"WHERE Username = '%s' AND Password = '%s' AND Access > 0;", str, user, pass);
 
+	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		return -1;
 	}
 	while (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -113,6 +121,7 @@ mqtt_rtlm_login(sl_config *cfg, sqlite3 *sql, const ch
 		break;
 	}
 	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }