--- mqtt/src/pubmqtt.c	2011/11/28 13:19:39	1.1.2.10
+++ mqtt/src/pubmqtt.c	2011/12/08 17:02:25	1.1.2.14
@@ -1,6 +1,9 @@
 #include "global.h"
 
 
+extern const char sql_schema[];
+
+
 /*
  * mqtt_db_log() Log database connection message
  *
@@ -36,18 +39,25 @@ mqtt_rtlm_open(sl_config *cfg)
 	if (!cfg)
 		return NULL;
 
+	sqlite3_config(SQLITE_CONFIG_SERIALIZED);
+
 	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;
 }
 
@@ -69,13 +79,18 @@ mqtt_rtlm_close(sqlite3 *sql)
  * @cfg = loaded config
  * @sql = SQL handle
  * @user = username
+ * @connid = connection id
  * @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 *user, const char *connid, 
+		const char *host, u_short port, char will, ...)
 {
+	va_list lst;
 	int ret = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
 	sqlite3_stmt *stmt;
@@ -88,8 +103,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 (Username, ConnID, RemoteHost, RemotePort, "
+				"WillFlag) VALUES ('%s', '%s', '%s', %d, 0);", str, user, connid, host, port);
+	else {
+		va_start(lst, will);
+		snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (Username, ConnID, RemoteHost, RemotePort, "
+				"WillFlag, WillRetain, WillQoS, WillMsg, WillTopic) "
+				"VALUES ('%s', '%s', '%s', %d, %d, %d, %d, '%s', '%s');", 
+				str, user, connid, host, port, 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);
@@ -113,11 +138,12 @@ mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, c
  * @cfg = loaded config
  * @sql = SQL handle
  * @user = username
+ * @connid = connection id
  * @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 *user, const char *connid, const char *host)
 {
 	int ret = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -131,8 +157,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 Username = '%s' AND ConnID = '%s' "
+			"AND RemoteHost LIKE '%s';", str, user, connid, host);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -156,11 +182,12 @@ mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, c
  * @cfg = loaded config
  * @sql = SQL handle
  * @user = username
+ * @connid = connection id
  * @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 *user, const char *connid, const char *host)
 {
 	int ret = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -174,8 +201,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, RemotePort FROM %s WHERE "
+			"Username = '%s' AND ConnID = '%s' AND RemoteHost LIKE '%s';", 
+			str, user, connid, host);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -195,6 +223,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 +232,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 +247,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 +273,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 +281,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 +307,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,12 +332,13 @@ mqtt_rtlm_delete_topic(sl_config *cfg, sqlite3 *sql, c
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @msgid = MessageID
  * @topic = topic
  * @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
  */
 mqtt_subscr_t *
-mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, const char *topic, char retain)
+mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, u_short msgid, const char *topic, char retain)
 {
 	int rowz = 0;
 	char *str, szStr[STRSIZ], szStmt[BUFSIZ] = { 0 };
@@ -334,8 +366,9 @@ mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, con
 		mqtt_rtlm_log("Error:: not found topics table name");
 		return NULL;
 	}
-	snprintf(szStmt, sizeof szStmt, "SELECT Retain, Topic, Value FROM %s WHERE Topic LIKE '%s' %s;", 
-			str, topic, szStr);
+	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);
@@ -354,7 +387,7 @@ mqtt_rtlm_read_topic(sl_config *cfg, sqlite3 *sql, con
 
 	/* fill with data */
 	for (j = 0; j < rowz && sqlite3_step(stmt) == SQLITE_ROW; j++) {
-		s[j].sub_ret = *sqlite3_column_text(stmt, 0);
+		s[j].sub_ret = (char) sqlite3_column_int(stmt, 0);
 		s[j].sub_topic._base = strdup(sqlite3_column_text(stmt, 1));
 		s[j].sub_topic._size = strlen(s[j].sub_topic._base);
 		s[j].sub_value._base = strdup(sqlite3_column_text(stmt, 2));