--- mqtt/src/pubmqtt.c	2011/12/16 02:09:20	1.1.2.17
+++ mqtt/src/pubmqtt.c	2012/04/25 12:04:30	1.2.2.5
@@ -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;
@@ -39,12 +40,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 +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;
 }
 
@@ -89,7 +92,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 +103,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 +121,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 +135,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 +151,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,16 +160,18 @@ 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;
 	}
 	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE ConnID = '%s' AND Username = '%s' "
-			"AND RemoteHost LIKE '%s';", str, user, connid, host);
+			"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 +182,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 +198,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 +207,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 +216,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 +227,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 +246,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 +256,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 +266,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 +280,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 +298,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 +308,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 +328,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 +342,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 +358,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 +381,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 +390,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;
 	}
 
@@ -390,13 +410,177 @@ mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, u_s
 	/* fill with data */
 	for (j = 0; j < rowz && sqlite3_step(stmt) == SQLITE_ROW; j++) {
 		s[j].sub_ret = (char) sqlite3_column_int(stmt, 0);
-		s[j].sub_topic._base = (u_char*) strdup((char*) sqlite3_column_text(stmt, 1));
-		s[j].sub_topic._size = strlen((char*) s[j].sub_topic._base);
-		s[j].sub_value._base = (u_char*) strdup((char*) sqlite3_column_text(stmt, 2));
-		s[j].sub_value._size = strlen((char*) s[j].sub_value._base);
+		s[j].sub_topic.msg_base = (u_char*) strdup((char*) sqlite3_column_text(stmt, 1));
+		s[j].sub_topic.msg_len = strlen((char*) s[j].sub_topic.msg_base);
+		s[j].sub_value.msg_base = (u_char*) strdup((char*) sqlite3_column_text(stmt, 2));
+		s[j].sub_value.msg_len = strlen((char*) s[j].sub_value.msg_base);
 	}
 end:
 	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
+
+	return s;
+}
+
+/*
+ * mqtt_rtlm_write_subscribe() Subscribe topic
+ *
+ * @cfg = loaded config
+ * @sql = SQL handle
+ * @msgid = MessageID
+ * @topic = topic
+ * @user = username
+ * @host = hostname
+ * @qos = Subscribe QoS
+ * return: -1 error, 0 no publish or >0 published ok
+ */
+int
+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;
+	char *str, szStmt[BUFSIZ] = { 0 };
+	sqlite3_stmt *stmt;
+
+	if (!cfg || !sql || !topic)
+		return -1;
+
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_subscribes");
+	if (!str) {
+		mqtt_rtlm_log("Error:: not found subscribes table name");
+		return -1;
+	}
+	snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (MsgID, QoS, Topic, PubUser, "
+			"PubDate, PubHost) VALUES (%d, %d, '%s', '%s', "
+			"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)
+		ret = sqlite3_changes(sql);
+	else {
+		if (ret > SQLITE_OK && ret < SQLITE_ROW)
+			MQTT_RTLM_LOG(sql);
+		ret = 0;
+	}
+	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
+
+	return ret;
+}
+
+/*
+ * mqtt_rtlm_delete_subscribe() Delete subscribe
+ *
+ * @cfg = loaded config
+ * @sql = SQL handle
+ * @topic = topic
+ * @user = username
+ * @host = hostname
+ * @qos = Subscribe QoS if -1 no matter
+ * return: -1 error, 0 no changes or >0 deleted rows
+ */
+int
+mqtt_rtlm_delete_subscribe(cfg_root_t *cfg, sqlite3 *sql, const char *topic, 
+		const char *user, const char *host, char qos)
+{
+	int ret = 0;
+	char *str, szStr[STRSIZ] = { 0 }, szStmt[BUFSIZ] = { 0 };
+	sqlite3_stmt *stmt;
+
+	if (!cfg || !sql || !topic)
+		return -1;
+
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_subscribes");
+	if (!str) {
+		mqtt_rtlm_log("Error:: not found subscribes table name");
+		return -1;
+	}
+	if (qos > -1 && qos < 3)
+		snprintf(szStr, sizeof szStr, "AND QoS = %d", qos);
+	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE Topic LIKE '%s' AND "
+			"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)
+		ret = sqlite3_changes(sql);
+	else {
+		if (ret > SQLITE_OK && ret < SQLITE_ROW)
+			MQTT_RTLM_LOG(sql);
+		ret = 0;
+	}
+	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
+
+	return ret;
+}
+
+/*
+ * mqtt_rtlm_read_subscribe() Get subscribe topic
+ *
+ * @cfg = loaded config
+ * @sql = SQL handle
+ * @topic = topic
+ * return: NULL error or not found and !=NULL allocated subscribe topics
+ */
+mqtt_subscr_t *
+mqtt_rtlm_read_subscribe(cfg_root_t *cfg, sqlite3 *sql, const char *topic)
+{
+	int rowz = 0;
+	char *str, szStmt[BUFSIZ] = { 0 };
+	sqlite3_stmt *stmt;
+	register int j;
+	mqtt_subscr_t *s = NULL;
+
+	if (!cfg || !sql || !topic)
+		return NULL;
+
+	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;
+	}
+
+	/* calculate count of rows and allocate subscribe items */
+	while (sqlite3_step(stmt) == SQLITE_ROW)
+		rowz++;
+	if (!(s = malloc((rowz + 1) * sizeof(mqtt_subscr_t)))) {
+		mqtt_rtlm_log("Error:: System #%d - %s", errno, strerror(errno));
+		goto end;
+	} else
+		memset(s, 0, (rowz + 1) * sizeof(mqtt_subscr_t));
+	sqlite3_reset(stmt);
+
+	/* fill with data */
+	for (j = 0; j < rowz && sqlite3_step(stmt) == SQLITE_ROW; j++) {
+		s[j].sub_ret = (char) sqlite3_column_int(stmt, 0);
+		s[j].sub_topic.msg_base = (u_char*) strdup((char*) sqlite3_column_text(stmt, 1));
+		s[j].sub_topic.msg_len = strlen((char*) s[j].sub_topic.msg_base);
+		s[j].sub_value.msg_base = NULL;
+		s[j].sub_value.msg_len = 0;
+	}
+end:
+	sqlite3_finalize(stmt);
+	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return s;
 }