--- mqtt/src/pubmqtt.c	2012/04/11 15:08:27	1.2.2.3
+++ mqtt/src/pubmqtt.c	2012/05/27 10:04:05	1.2.2.9
@@ -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))))
 
 
@@ -39,11 +40,6 @@ mqtt_rtlm_open(cfg_root_t *cfg)
 	if (!cfg)
 		return NULL;
 
-	/*
-	if (!sqlite3_threadsafe() || sqlite3_config(SQLITE_CONFIG_SERIALIZED))
-		return NULL;
-		*/
-
 	str = cfg_getAttribute(cfg, "mqtt_pub", "name");
 	if (!str) {
 		mqtt_rtlm_log("Error:: Unknown database name ...\n");
@@ -204,7 +200,7 @@ mqtt_rtlm_chk_session(cfg_root_t *cfg, sqlite3 *sql, c
 		return -1;
 	}
 	snprintf(szStmt, sizeof szStmt, "SELECT ConnID, RemoteHost FROM %s WHERE "
-			"ConnID = '%s' AND Username = '%s' AND RemoteHost LIKE '%s';", 
+			"ConnID = '%s' AND Username LIKE '%s' AND RemoteHost LIKE '%s';", 
 			str, connid, user, host);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
@@ -225,6 +221,7 @@ mqtt_rtlm_chk_session(cfg_root_t *cfg, sqlite3 *sql, c
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @connid = connection id
  * @msgid = MessageID
  * @topic = topic
  * @txt = text
@@ -234,8 +231,8 @@ mqtt_rtlm_chk_session(cfg_root_t *cfg, sqlite3 *sql, c
  * return: -1 error, 0 no publish or >0 published ok
  */
 int
-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)
+mqtt_rtlm_write_topic(cfg_root_t *cfg, sqlite3 *sql, const char *connid, u_short msgid, 
+		const char *topic, const char *txt, const char *user, const char *host, char retain)
 {
 	int ret = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -249,10 +246,10 @@ mqtt_rtlm_write_topic(cfg_root_t *cfg, sqlite3 *sql, u
 		mqtt_rtlm_log("Error:: not found topics table name");
 		return -1;
 	}
-	snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (Retain, MsgID, Topic, Value, PubUser, "
-			"PubDate, PubHost) VALUES (%d, %d, '%s', '%s', '%s', "
+	snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (Retain, ConnID, MsgID, Topic, Value, PubUser, "
+			"PubDate, PubHost) VALUES (%d, '%s', %d, '%s', '%s', '%s', "
 			"datetime('now', 'localtime'), '%s');", 
-			str, retain, msgid, topic, txt, user, host);
+			str, retain, connid, msgid, topic, txt, user, host);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -271,10 +268,66 @@ mqtt_rtlm_write_topic(cfg_root_t *cfg, sqlite3 *sql, u
 }
 
 /*
+ * mqtt_rtlm_wipe_topic() Wipe all topics
+ *
+ * @cfg = loaded config
+ * @sql = SQL handle
+ * @connid = connection id
+ * @user = username
+ * @retain = -1 no matter
+ * return: -1 error, 0 no changes or >0 deleted rows
+ */
+int
+mqtt_rtlm_wipe_topic(cfg_root_t *cfg, sqlite3 *sql, const char *connid, const char *user, char retain)
+{
+	int ret = 0;
+	char *str, *rtn, szStmt[BUFSIZ] = { 0 };
+	sqlite3_stmt *stmt;
+
+	if (!cfg || !sql || !connid)
+		return -1;
+
+	str = (char*) cfg_getAttribute(cfg, "mqtt_pub", "tbl_topics");
+	if (!str) {
+		mqtt_rtlm_log("Error:: not found topics table name");
+		return -1;
+	}
+	switch (retain) {
+		case -1:
+			rtn = "";
+			break;
+		case 0:
+			rtn = "AND Retain = 0";
+			break;
+		default:
+			rtn = "AND Retain != 0";
+			break;
+	}
+	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE ConnID = '%s' AND "
+			"PubUser LIKE '%s' %s;", str, connid, user, rtn);
+
+	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
+		MQTT_RTLM_LOG(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);
+
+	return ret;
+}
+
+/*
  * mqtt_rtlm_delete_topic() Delete topic
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @connid = connection id
  * @msgid = MessageID
  * @topic = topic
  * @user = username
@@ -283,8 +336,8 @@ mqtt_rtlm_write_topic(cfg_root_t *cfg, sqlite3 *sql, u
  * return: -1 error, 0 no changes or >0 deleted rows
  */
 int
-mqtt_rtlm_delete_topic(cfg_root_t *cfg, sqlite3 *sql, u_short msgid, const char *topic, 
-		const char *user, const char *host, char retain)
+mqtt_rtlm_delete_topic(cfg_root_t *cfg, sqlite3 *sql, const char *connid, u_short msgid, 
+		const char *topic, const char *user, const char *host, char retain)
 {
 	int ret = 0;
 	char *str, *rtn, szStmt[BUFSIZ] = { 0 };
@@ -309,9 +362,9 @@ mqtt_rtlm_delete_topic(cfg_root_t *cfg, sqlite3 *sql, 
 			rtn = "AND Retain != 0";
 			break;
 	}
-	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE MsgID = %d AND Topic LIKE '%s' AND "
-			"PubUser LIKE '%s' AND PubHost LIKE '%s' %s;", str, 
-			msgid, topic, user, host, rtn);
+	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE ConnID = '%s' AND MsgID = %d AND "
+			"Topic LIKE '%s' AND PubUser LIKE '%s' AND PubHost LIKE '%s' %s;", str, 
+			connid, msgid, topic, user, host, rtn);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -334,13 +387,15 @@ mqtt_rtlm_delete_topic(cfg_root_t *cfg, sqlite3 *sql, 
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @connid = connection id
  * @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(cfg_root_t *cfg, sqlite3 *sql, u_short msgid, const char *topic, char retain)
+mqtt_rtlm_read_topic(cfg_root_t *cfg, sqlite3 *sql, const char *connid, u_short msgid, 
+		const char *topic, char retain)
 {
 	int rowz = 0;
 	char *str, szStr[STRSIZ], szStmt[BUFSIZ] = { 0 };
@@ -369,8 +424,8 @@ mqtt_rtlm_read_topic(cfg_root_t *cfg, sqlite3 *sql, u_
 		return NULL;
 	}
 	snprintf(szStmt, sizeof szStmt, "SELECT Retain, Topic, Value FROM %s WHERE "
-			"MsgID = %d AND Topic LIKE '%s' %s;", 
-			str, msgid, topic, szStr);
+			"ConnID = '%s' AND MsgID = %d AND Topic LIKE '%s' %s;", 
+			str, connid, msgid, topic, szStr);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -380,7 +435,7 @@ mqtt_rtlm_read_topic(cfg_root_t *cfg, sqlite3 *sql, u_
 	/* calculate count of rows and allocate subscribe items */
 	while (sqlite3_step(stmt) == SQLITE_ROW)
 		rowz++;
-	if (!(s = malloc((rowz + 1) * sizeof(mqtt_subscr_t)))) {
+	if (!(s = io_malloc((rowz + 1) * sizeof(mqtt_subscr_t)))) {
 		mqtt_rtlm_log("Error:: System #%d - %s", errno, strerror(errno));
 		goto end;
 	} else
@@ -390,9 +445,9 @@ mqtt_rtlm_read_topic(cfg_root_t *cfg, sqlite3 *sql, u_
 	/* 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_base = (u_char*) io_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_base = (u_char*) io_strdup((char*) sqlite3_column_text(stmt, 2));
 		s[j].sub_value.msg_len = strlen((char*) s[j].sub_value.msg_base);
 	}
 end:
@@ -406,6 +461,7 @@ end:
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @connid = connection id
  * @msgid = MessageID
  * @topic = topic
  * @user = username
@@ -414,8 +470,8 @@ end:
  * 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)
+mqtt_rtlm_write_subscribe(cfg_root_t *cfg, sqlite3 *sql, const char *connid, u_short msgid, 
+		const char *topic, const char *user, const char *host, char qos)
 {
 	int ret = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -429,10 +485,10 @@ mqtt_rtlm_write_subscribe(cfg_root_t *cfg, sqlite3 *sq
 		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', "
+	snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (ConnID, MsgID, QoS, Topic, PubUser, "
+			"PubDate, PubHost) VALUES ('%s', %d, %d, '%s', '%s', "
 			"datetime('now', 'localtime'), '%s');", str, 
-			msgid, qos, topic, user, host);
+			connid, msgid, qos, topic, user, host);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -455,18 +511,18 @@ mqtt_rtlm_write_subscribe(cfg_root_t *cfg, sqlite3 *sq
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @connid = connection id
  * @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)
+mqtt_rtlm_delete_subscribe(cfg_root_t *cfg, sqlite3 *sql, const char *connid, 
+		const char *topic, const char *user, const char *host)
 {
 	int ret = 0;
-	char *str, szStr[STRSIZ] = { 0 }, szStmt[BUFSIZ] = { 0 };
+	char *str, szStmt[BUFSIZ] = { 0 };
 	sqlite3_stmt *stmt;
 
 	if (!cfg || !sql || !topic)
@@ -477,11 +533,9 @@ mqtt_rtlm_delete_subscribe(cfg_root_t *cfg, sqlite3 *s
 		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);
+	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE ConnID = '%s' AND "
+			"Topic LIKE '%s' AND PubUser LIKE '%s' AND PubHost LIKE '%s';", str, 
+			connid, topic, user, host);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -504,11 +558,12 @@ mqtt_rtlm_delete_subscribe(cfg_root_t *cfg, sqlite3 *s
  *
  * @cfg = loaded config
  * @sql = SQL handle
+ * @connid = connection id
  * @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)
+mqtt_rtlm_read_subscribe(cfg_root_t *cfg, sqlite3 *sql, const char *connid, const char *topic)
 {
 	int rowz = 0;
 	char *str, szStmt[BUFSIZ] = { 0 };
@@ -524,7 +579,8 @@ mqtt_rtlm_read_subscribe(cfg_root_t *cfg, sqlite3 *sql
 		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);
+	snprintf(szStmt, sizeof szStmt, "SELECT QoS, Topic FROM %s WHERE ConnID = '%s' AND "
+			"Topic LIKE '%s';", str, connid, topic);
 
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
@@ -534,7 +590,7 @@ mqtt_rtlm_read_subscribe(cfg_root_t *cfg, sqlite3 *sql
 	/* calculate count of rows and allocate subscribe items */
 	while (sqlite3_step(stmt) == SQLITE_ROW)
 		rowz++;
-	if (!(s = malloc((rowz + 1) * sizeof(mqtt_subscr_t)))) {
+	if (!(s = io_malloc((rowz + 1) * sizeof(mqtt_subscr_t)))) {
 		mqtt_rtlm_log("Error:: System #%d - %s", errno, strerror(errno));
 		goto end;
 	} else
@@ -544,7 +600,7 @@ mqtt_rtlm_read_subscribe(cfg_root_t *cfg, sqlite3 *sql
 	/* 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_base = (u_char*) io_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;