--- mqtt/src/pubmqtt.c	2012/02/01 15:44:40	1.2.2.2
+++ mqtt/src/pubmqtt.c	2012/04/25 07:37:16	1.2.2.4
@@ -31,7 +31,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;
@@ -39,12 +39,11 @@ mqtt_rtlm_open(sl_config *cfg)
 	if (!cfg)
 		return NULL;
 
-	/*
-	if (!sqlite3_threadsafe() || sqlite3_config(SQLITE_CONFIG_SERIALIZED))
+	sqlite3_config(SQLITE_CONFIG_SERIALIZED);
+	if (!sqlite3_threadsafe())
 		return NULL;
-		*/
 
-	str = (const char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("name"));
+	str = cfg_getAttribute(cfg, "mqtt_pub", "name");
 	if (!str) {
 		mqtt_rtlm_log("Error:: Unknown database name ...\n");
 		return NULL;
@@ -56,11 +55,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;
 }
 
@@ -89,7 +91,7 @@ mqtt_rtlm_close(sqlite3 *sql)
  * return: -1 error, 0 session already appears or >0 row changed
  */
 int
-mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, const char *connid, const char *user, 
+mqtt_rtlm_init_session(cfg_root_t *cfg, sqlite3 *sql, const char *connid, const char *user, 
 		const char *host, char will, ...)
 {
 	va_list lst;
@@ -100,7 +102,7 @@ mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, c
 	if (!cfg || !sql)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_online"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_online");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found online table name");
 		return -1;
@@ -118,8 +120,10 @@ mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, c
 		va_end(lst);
 	}
 
+	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;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
@@ -130,6 +134,7 @@ mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, c
 		ret = 0;
 	}
 	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -145,7 +150,7 @@ mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, c
  * return: -1 error, 0 session already appears or >0 row changed
  */
 int
-mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, const char *connid, const char *user, const char *host)
+mqtt_rtlm_fini_session(cfg_root_t *cfg, sqlite3 *sql, const char *connid, const char *user, const char *host)
 {
 	int ret = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -154,7 +159,7 @@ mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, c
 	if (!cfg || !sql)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_online"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_online");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found online table name");
 		return -1;
@@ -162,8 +167,10 @@ mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, c
 	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE ConnID = '%s' AND Username = '%s' "
 			"AND RemoteHost LIKE '%s';", str, connid, user, host);
 
+	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;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
@@ -174,6 +181,7 @@ mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, c
 		ret = 0;
 	}
 	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -189,7 +197,7 @@ mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, c
  * return: -1 error, 0 not logged or >0 logged found rows
  */
 int
-mqtt_rtlm_chk_session(sl_config *cfg, sqlite3 *sql, const char *connid, const char *user, const char *host)
+mqtt_rtlm_chk_session(cfg_root_t *cfg, sqlite3 *sql, const char *connid, const char *user, const char *host)
 {
 	int ret = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -198,7 +206,7 @@ mqtt_rtlm_chk_session(sl_config *cfg, sqlite3 *sql, co
 	if (!cfg || !sql)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_online"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_online");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found online table name");
 		return -1;
@@ -207,8 +215,10 @@ mqtt_rtlm_chk_session(sl_config *cfg, sqlite3 *sql, co
 			"ConnID = '%s' AND Username = '%s' AND RemoteHost LIKE '%s';", 
 			str, connid, user, host);
 
+	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;
 	}
 	if (sqlite3_step(stmt) == SQLITE_ROW)
@@ -216,6 +226,7 @@ mqtt_rtlm_chk_session(sl_config *cfg, sqlite3 *sql, co
 	else
 		ret = 0;
 	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -234,7 +245,7 @@ mqtt_rtlm_chk_session(sl_config *cfg, sqlite3 *sql, co
  * return: -1 error, 0 no publish or >0 published ok
  */
 int
-mqtt_rtlm_write_topic(sl_config *cfg, sqlite3 *sql, u_short msgid, const char *topic, const char *txt, 
+mqtt_rtlm_write_topic(cfg_root_t *cfg, sqlite3 *sql, u_short msgid, const char *topic, const char *txt, 
 		const char *user, const char *host, char retain)
 {
 	int ret = 0;
@@ -244,7 +255,7 @@ mqtt_rtlm_write_topic(sl_config *cfg, sqlite3 *sql, u_
 	if (!cfg || !sql || !topic)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_topics"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_topics");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found topics table name");
 		return -1;
@@ -254,8 +265,10 @@ mqtt_rtlm_write_topic(sl_config *cfg, sqlite3 *sql, u_
 			"datetime('now', 'localtime'), '%s');", 
 			str, retain, msgid, topic, txt, user, host);
 
+	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;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
@@ -266,6 +279,7 @@ mqtt_rtlm_write_topic(sl_config *cfg, sqlite3 *sql, u_
 		ret = 0;
 	}
 	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -283,7 +297,7 @@ mqtt_rtlm_write_topic(sl_config *cfg, sqlite3 *sql, u_
  * return: -1 error, 0 no changes or >0 deleted rows
  */
 int
-mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, u_short msgid, const char *topic, 
+mqtt_rtlm_delete_topic(cfg_root_t *cfg, sqlite3 *sql, u_short msgid, const char *topic, 
 		const char *user, const char *host, char retain)
 {
 	int ret = 0;
@@ -293,7 +307,7 @@ mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, u
 	if (!cfg || !sql || !topic)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_topics"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_topics");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found topics table name");
 		return -1;
@@ -313,8 +327,10 @@ mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, u
 			"PubUser LIKE '%s' AND PubHost LIKE '%s' %s;", str, 
 			msgid, topic, user, host, rtn);
 
+	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;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
@@ -325,6 +341,7 @@ mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, u
 		ret = 0;
 	}
 	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -340,7 +357,7 @@ mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, u
  * return: NULL error or not found and !=NULL allocated subscribe topics
  */
 mqtt_subscr_t *
-mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, u_short msgid, const char *topic, char retain)
+mqtt_rtlm_read_topic(cfg_root_t *cfg, sqlite3 *sql, u_short msgid, const char *topic, char retain)
 {
 	int rowz = 0;
 	char *str, szStr[STRSIZ], szStmt[BUFSIZ] = { 0 };
@@ -363,7 +380,7 @@ mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, u_s
 			break;
 	}
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_topics"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_topics");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found topics table name");
 		return NULL;
@@ -372,8 +389,10 @@ mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, u_s
 			"MsgID = %d AND Topic LIKE '%s' %s;", 
 			str, msgid, topic, szStr);
 
+	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 NULL;
 	}
 
@@ -397,6 +416,7 @@ mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, u_s
 	}
 end:
 	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return s;
 }
@@ -414,7 +434,7 @@ end:
  * return: -1 error, 0 no publish or >0 published ok
  */
 int
-mqtt_rtlm_write_subscribe(sl_config *cfg, sqlite3 *sql, u_short msgid, const char *topic, 
+mqtt_rtlm_write_subscribe(cfg_root_t *cfg, sqlite3 *sql, u_short msgid, const char *topic, 
 		const char *user, const char *host, char qos)
 {
 	int ret = 0;
@@ -424,7 +444,7 @@ mqtt_rtlm_write_subscribe(sl_config *cfg, sqlite3 *sql
 	if (!cfg || !sql || !topic)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_subscribes"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_subscribes");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found subscribes table name");
 		return -1;
@@ -434,8 +454,10 @@ mqtt_rtlm_write_subscribe(sl_config *cfg, sqlite3 *sql
 			"datetime('now', 'localtime'), '%s');", str, 
 			msgid, qos, topic, user, host);
 
+	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;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
@@ -446,6 +468,7 @@ mqtt_rtlm_write_subscribe(sl_config *cfg, sqlite3 *sql
 		ret = 0;
 	}
 	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -462,7 +485,7 @@ mqtt_rtlm_write_subscribe(sl_config *cfg, sqlite3 *sql
  * return: -1 error, 0 no changes or >0 deleted rows
  */
 int
-mqtt_rtlm_delete_subscribe(sl_config *cfg, sqlite3 *sql, const char *topic, 
+mqtt_rtlm_delete_subscribe(cfg_root_t *cfg, sqlite3 *sql, const char *topic, 
 		const char *user, const char *host, char qos)
 {
 	int ret = 0;
@@ -472,7 +495,7 @@ mqtt_rtlm_delete_subscribe(sl_config *cfg, sqlite3 *sq
 	if (!cfg || !sql || !topic)
 		return -1;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_subscribes"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_subscribes");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found subscribes table name");
 		return -1;
@@ -483,8 +506,10 @@ mqtt_rtlm_delete_subscribe(sl_config *cfg, sqlite3 *sq
 			"PubUser LIKE '%s' AND PubHost LIKE '%s' %s;", str, 
 			topic, user, host, szStr);
 
+	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;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
@@ -495,6 +520,7 @@ mqtt_rtlm_delete_subscribe(sl_config *cfg, sqlite3 *sq
 		ret = 0;
 	}
 	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -508,7 +534,7 @@ mqtt_rtlm_delete_subscribe(sl_config *cfg, sqlite3 *sq
  * return: NULL error or not found and !=NULL allocated subscribe topics
  */
 mqtt_subscr_t *
-mqtt_rtlm_read_subscribe(sl_config *cfg, sqlite3 *sql, const char *topic)
+mqtt_rtlm_read_subscribe(cfg_root_t *cfg, sqlite3 *sql, const char *topic)
 {
 	int rowz = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -519,15 +545,17 @@ mqtt_rtlm_read_subscribe(sl_config *cfg, sqlite3 *sql,
 	if (!cfg || !sql || !topic)
 		return NULL;
 
-	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_subscribes"));
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_subscribes");
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found subscribes table name");
 		return NULL;
 	}
 	snprintf(szStmt, sizeof szStmt, "SELECT QoS, Topic FROM %s WHERE Topic LIKE '%s';", str, topic);
 
+	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 NULL;
 	}
 
@@ -551,6 +579,7 @@ mqtt_rtlm_read_subscribe(sl_config *cfg, sqlite3 *sql,
 	}
 end:
 	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return s;
 }