--- mqtt/src/pubmqtt.c	2011/11/28 10:17:12	1.1.2.9
+++ mqtt/src/pubmqtt.c	2012/01/27 15:05:38	1.2
@@ -1,6 +1,9 @@
 #include "global.h"
 
 
+extern const char sql_schema[];
+
+
 /*
  * mqtt_db_log() Log database connection message
  *
@@ -36,18 +39,28 @@ 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_pub"), CFG("name"));
 	if (!str) {
 		mqtt_rtlm_log("Error:: Unknown database name ...\n");
 		return NULL;
 	}
 
-	if (sqlite3_open_v2(str, &sql, SQLITE_OPEN_READWRITE, 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;
 }
 
@@ -68,14 +81,18 @@ mqtt_rtlm_close(sqlite3 *sql)
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @connid = connection id
  * @user = username
  * @host = hostname
- * @port = port
+ * @will = will flag if !=0 must fill arguments
+ * @... = will arguments in order topic,msg,qos,retain
  * return: -1 error, 0 session already appears or >0 row changed
  */
 int
-mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, const char *user, const char *host, u_short port)
+mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, const char *connid, const char *user, 
+		const char *host, char will, ...)
 {
+	va_list lst;
 	int ret = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
 	sqlite3_stmt *stmt;
@@ -88,8 +105,18 @@ mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, c
 		mqtt_rtlm_log("Error:: not found online table name");
 		return -1;
 	}
-	snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (Username, RemoteHost, RemotePort) "
-		       "VALUES ('%s', '%s', %d);", str, user, host, port);
+	if (!will)
+		snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (ConnID, Username, RemoteHost, "
+				"WillFlag) VALUES ('%s', '%s', '%s', 0);", str, connid, user, host);
+	else {
+		va_start(lst, will);
+		snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (ConnID, Username, RemoteHost, "
+				"WillFlag, WillRetain, WillQoS, WillMsg, WillTopic) "
+				"VALUES ('%s', '%s', '%s', %d, %d, %d, '%s', '%s');", 
+				str, connid, user, host, will, 
+				va_arg(lst, int), va_arg(lst, int), va_arg(lst, char*), va_arg(lst, char*));
+		va_end(lst);
+	}
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -112,12 +139,13 @@ mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, c
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @connid = connection id
  * @user = username
  * @host = hostname
  * return: -1 error, 0 session already appears or >0 row changed
  */
 int
-mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, const char *user, const char *host)
+mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, const char *connid, const char *user, const char *host)
 {
 	int ret = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -131,8 +159,8 @@ mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, c
 		mqtt_rtlm_log("Error:: not found online table name");
 		return -1;
 	}
-	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE Username = '%s' AND RemoteHost LIKE '%s';", 
-			str, user, host);
+	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE ConnID = '%s' AND Username = '%s' "
+			"AND RemoteHost LIKE '%s';", str, connid, user, host);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -155,12 +183,13 @@ mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, c
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @connid = connection id
  * @user = username
  * @host = hostname
  * return: -1 error, 0 not logged or >0 logged found rows
  */
 int
-mqtt_rtlm_chk_session(sl_config *cfg, sqlite3 *sql, const char *user, const char *host)
+mqtt_rtlm_chk_session(sl_config *cfg, sqlite3 *sql, const char *connid, const char *user, const char *host)
 {
 	int ret = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -174,8 +203,9 @@ mqtt_rtlm_chk_session(sl_config *cfg, sqlite3 *sql, co
 		mqtt_rtlm_log("Error:: not found online table name");
 		return -1;
 	}
-	snprintf(szStmt, sizeof szStmt, "SELECT RemoteHost, RemotePort FROM %s WHERE "
-			"Username = '%s' AND RemoteHost LIKE '%s';", str, user, host);
+	snprintf(szStmt, sizeof szStmt, "SELECT ConnID, RemoteHost FROM %s WHERE "
+			"ConnID = '%s' AND Username = '%s' AND RemoteHost LIKE '%s';", 
+			str, connid, user, host);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -195,6 +225,7 @@ mqtt_rtlm_chk_session(sl_config *cfg, sqlite3 *sql, co
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @msgid = MessageID
  * @topic = topic
  * @txt = text
  * @user = username
@@ -203,7 +234,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, const char *topic, const char *txt, 
+mqtt_rtlm_write_topic(sl_config *cfg, sqlite3 *sql, u_short msgid, const char *topic, const char *txt, 
 		const char *user, const char *host, char retain)
 {
 	int ret = 0;
@@ -218,9 +249,10 @@ mqtt_rtlm_write_topic(sl_config *cfg, sqlite3 *sql, co
 		mqtt_rtlm_log("Error:: not found topics table name");
 		return -1;
 	}
-	snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (Retain, Topic, Value, PubUser, PubDate, PubHost) "
-			"VALUES (%d, '%s', '%s', '%s', datetime('now', 'localtime'), '%s');", str, 
-			retain, topic, txt, user, host);
+	snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (Retain, MsgID, Topic, Value, PubUser, "
+			"PubDate, PubHost) VALUES (%d, %d, '%s', '%s', '%s', "
+			"datetime('now', 'localtime'), '%s');", 
+			str, retain, msgid, topic, txt, user, host);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -243,6 +275,7 @@ mqtt_rtlm_write_topic(sl_config *cfg, sqlite3 *sql, co
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @msgid = MessageID
  * @topic = topic
  * @user = username
  * @host = hostname
@@ -250,7 +283,7 @@ mqtt_rtlm_write_topic(sl_config *cfg, sqlite3 *sql, co
  * return: -1 error, 0 no changes or >0 deleted rows
  */
 int
-mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, const char *topic, 
+mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, u_short msgid, const char *topic, 
 		const char *user, const char *host, char retain)
 {
 	int ret = 0;
@@ -276,9 +309,9 @@ mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, c
 			rtn = "AND Retain != 0";
 			break;
 	}
-	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE Topic LIKE '%s' AND "
+	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE MsgID = %d AND Topic LIKE '%s' AND "
 			"PubUser LIKE '%s' AND PubHost LIKE '%s' %s;", str, 
-			topic, user, host, rtn);
+			msgid, topic, user, host, rtn);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -301,37 +334,69 @@ mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, c
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @msgid = MessageID
  * @topic = topic
- * return: -1 error, 0 not found or >0 topics rows
+ * @retain = retain 0 get only dynamic, >0 get only retained and -1 no matter
+ * return: NULL error or not found and !=NULL allocated subscribe topics
  */
-int
-mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, const char *topic)
+mqtt_subscr_t *
+mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, u_short msgid, const char *topic, char retain)
 {
-	int colz, ret = 0;
-	char *str, szStmt[BUFSIZ] = { 0 };
+	int rowz = 0;
+	char *str, szStr[STRSIZ], szStmt[BUFSIZ] = { 0 };
 	sqlite3_stmt *stmt;
-	register int i;
+	register int j;
+	mqtt_subscr_t *s = NULL;
 
-	if (!cfg || !sql)
-		return -1;
+	if (!cfg || !sql || !topic)
+		return NULL;
 
+	switch (retain) {
+		case -1:
+			memset(szStr, 0, sizeof szStr);
+			break;
+		case 0:
+			snprintf(szStr, sizeof szStr, "AND Retain = 0");
+			break;
+		default:
+			snprintf(szStr, sizeof szStr, "AND Retain > 0");
+			break;
+	}
+
 	str = (char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("tbl_topics"));
 	if (!str) {
 		mqtt_rtlm_log("Error:: not found topics table name");
-		return -1;
+		return NULL;
 	}
-	snprintf(szStmt, sizeof szStmt, "SELECT Retain, Topic, Value FROM %s WHERE Topic LIKE '%s';", 
-			str, topic);
+	snprintf(szStmt, sizeof szStmt, "SELECT Retain, Topic, Value FROM %s WHERE "
+			"MsgID = %d AND Topic LIKE '%s' %s;", 
+			str, msgid, topic, szStr);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
-		return -1;
+		return NULL;
 	}
-	while (sqlite3_step(stmt) == SQLITE_ROW && (colz = sqlite3_column_count(stmt))) {
-		for (i = 0; i < colz; i++) {
-		}
+
+	/* 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._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);
 	}
+end:
 	sqlite3_finalize(stmt);
 
-	return ret;
+	return s;
 }