--- mqtt/src/pubmqtt.c	2012/05/27 10:12:48	1.2.2.10
+++ mqtt/src/pubmqtt.c	2012/06/26 08:05:58	1.2.2.11
@@ -103,7 +103,7 @@ mqtt_rtlm_init_session(cfg_root_t *cfg, sqlite3 *sql, 
 {
 	va_list lst;
 	int ret = 0;
-	char *str, szStmt[BUFSIZ] = { 0 };
+	char *str, *psStmt;
 	sqlite3_stmt *stmt;
 
 	if (!cfg || !sql)
@@ -115,22 +115,24 @@ mqtt_rtlm_init_session(cfg_root_t *cfg, sqlite3 *sql, 
 		return -1;
 	}
 	if (!will)
-		snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (ConnID, Username, RemoteHost, "
-				"WillFlag) VALUES ('%s', '%s', '%s', 0);", str, connid, user, host);
+		psStmt = sqlite3_mprintf("INSERT INTO %s (ConnID, Username, RemoteHost, "
+				"WillFlag) VALUES ('%q', '%q', '%q', 0);", str, connid, user, host);
 	else {
 		va_start(lst, will);
-		snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (ConnID, Username, RemoteHost, "
+		psStmt = sqlite3_mprintf("INSERT INTO %s (ConnID, Username, RemoteHost, "
 				"WillFlag, WillRetain, WillQoS, WillMsg, WillTopic) "
-				"VALUES ('%s', '%s', '%s', %d, %d, %d, '%s', '%s');", 
+				"VALUES ('%q', '%q', '%q', %d, %d, %d, '%q', '%q');", 
 				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)) {
+	if (sqlite3_prepare_v2(sql, psStmt, strlen(psStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_free(psStmt);
 		return -1;
-	}
+	} else
+		sqlite3_free(psStmt);
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
 		ret = sqlite3_changes(sql);
 	else {
@@ -157,7 +159,7 @@ int
 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 };
+	char *str, *psStmt;
 	sqlite3_stmt *stmt;
 
 	if (!cfg || !sql)
@@ -168,13 +170,15 @@ mqtt_rtlm_fini_session(cfg_root_t *cfg, sqlite3 *sql, 
 		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, connid, user, host);
+	psStmt = sqlite3_mprintf("DELETE FROM %s WHERE ConnID = '%q' AND Username = '%q' "
+			"AND RemoteHost LIKE '%q';", str, connid, user, host);
 
-	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
+	if (sqlite3_prepare_v2(sql, psStmt, strlen(psStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_free(psStmt);
 		return -1;
-	}
+	} else
+		sqlite3_free(psStmt);
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
 		ret = sqlite3_changes(sql);
 	else {
@@ -201,7 +205,7 @@ int
 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 };
+	char *str, *psStmt;
 	sqlite3_stmt *stmt;
 
 	if (!cfg || !sql)
@@ -212,14 +216,16 @@ mqtt_rtlm_chk_session(cfg_root_t *cfg, sqlite3 *sql, c
 		mqtt_rtlm_log("Error:: not found online table name");
 		return -1;
 	}
-	snprintf(szStmt, sizeof szStmt, "SELECT ConnID, RemoteHost FROM %s WHERE "
-			"ConnID = '%s' AND Username LIKE '%s' AND RemoteHost LIKE '%s';", 
+	psStmt = sqlite3_mprintf("SELECT ConnID, RemoteHost FROM %s WHERE "
+			"ConnID = '%q' AND Username LIKE '%q' AND RemoteHost LIKE '%q';", 
 			str, connid, user, host);
 
-	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
+	if (sqlite3_prepare_v2(sql, psStmt, strlen(psStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_free(psStmt);
 		return -1;
-	}
+	} else
+		sqlite3_free(psStmt);
 	if (sqlite3_step(stmt) == SQLITE_ROW)
 		ret = sqlite3_changes(sql);
 	else
@@ -238,6 +244,7 @@ mqtt_rtlm_chk_session(cfg_root_t *cfg, sqlite3 *sql, c
  * @msgid = MessageID
  * @topic = topic
  * @txt = text
+ * @txtlen = text length
  * @user = username
  * @host = hostname
  * @retain = !=0 retain message to database
@@ -245,10 +252,10 @@ mqtt_rtlm_chk_session(cfg_root_t *cfg, sqlite3 *sql, c
  */
 int
 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)
+		const char *topic, void *txt, int txtlen, const char *user, const char *host, char retain)
 {
 	int ret = 0;
-	char *str, szStmt[BUFSIZ] = { 0 };
+	char *str, *psStmt;
 	sqlite3_stmt *stmt;
 
 	if (!cfg || !sql || !topic)
@@ -259,14 +266,21 @@ mqtt_rtlm_write_topic(cfg_root_t *cfg, sqlite3 *sql, c
 		mqtt_rtlm_log("Error:: not found topics table name");
 		return -1;
 	}
-	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');", 
+	psStmt = sqlite3_mprintf("INSERT INTO %s (Retain, ConnID, MsgID, Topic, Value, PubUser, "
+			"PubDate, PubHost) VALUES (%d, '%q', %u, '%q', ?1, '%q', "
+			"datetime('now', 'localtime'), '%q');", 
 			str, retain, connid, msgid, topic, txt, user, host);
 
-	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
+	if (sqlite3_prepare_v2(sql, psStmt, strlen(psStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_free(psStmt);
 		return -1;
+	} else
+		sqlite3_free(psStmt);
+	if (sqlite3_bind_blob(stmt, 1, txt, txtlen, SQLITE_TRANSIENT)) {
+		MQTT_RTLM_LOG(sql);
+		sqlite3_finalize(stmt);
+		return -1;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
 		ret = sqlite3_changes(sql);
@@ -294,7 +308,7 @@ 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 };
+	char *str, *rtn, *psStmt;
 	sqlite3_stmt *stmt;
 
 	if (!cfg || !sql || !connid)
@@ -316,13 +330,15 @@ mqtt_rtlm_wipe_topic(cfg_root_t *cfg, sqlite3 *sql, co
 			rtn = "AND Retain != 0";
 			break;
 	}
-	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE ConnID = '%s' AND "
-			"PubUser LIKE '%s' %s;", str, connid, user, rtn);
+	psStmt = sqlite3_mprintf("DELETE FROM %s WHERE ConnID = '%q' AND "
+			"PubUser LIKE '%q' %s;", str, connid, user, rtn);
 
-	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
+	if (sqlite3_prepare_v2(sql, psStmt, strlen(psStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_free(psStmt);
 		return -1;
-	}
+	} else
+		sqlite3_free(psStmt);
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
 		ret = sqlite3_changes(sql);
 	else {
@@ -353,7 +369,7 @@ mqtt_rtlm_delete_topic(cfg_root_t *cfg, sqlite3 *sql, 
 		const char *topic, const char *user, const char *host, char retain)
 {
 	int ret = 0;
-	char *str, *rtn, szStmt[BUFSIZ] = { 0 };
+	char *str, *rtn, *psStmt;
 	sqlite3_stmt *stmt;
 
 	if (!cfg || !sql || !topic)
@@ -375,14 +391,16 @@ mqtt_rtlm_delete_topic(cfg_root_t *cfg, sqlite3 *sql, 
 			rtn = "AND Retain != 0";
 			break;
 	}
-	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, 
+	psStmt = sqlite3_mprintf("DELETE FROM %s WHERE ConnID = '%q' AND MsgID = %d AND "
+			"Topic LIKE '%q' AND PubUser LIKE '%q' AND PubHost LIKE '%q' %s;", str, 
 			connid, msgid, topic, user, host, rtn);
 
-	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
+	if (sqlite3_prepare_v2(sql, psStmt, strlen(psStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_free(psStmt);
 		return -1;
-	}
+	} else
+		sqlite3_free(psStmt);
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
 		ret = sqlite3_changes(sql);
 	else {
@@ -411,10 +429,11 @@ mqtt_rtlm_read_topic(cfg_root_t *cfg, sqlite3 *sql, co
 		const char *topic, char retain)
 {
 	int rowz = 0;
-	char *str, szStr[STRSIZ], szStmt[BUFSIZ] = { 0 };
+	char *str, szStr[STRSIZ], *psStmt;
 	sqlite3_stmt *stmt;
 	register int j;
 	mqtt_subscr_t *s = NULL;
+	ait_val_t v;
 
 	if (!cfg || !sql || !topic)
 		return NULL;
@@ -436,14 +455,16 @@ mqtt_rtlm_read_topic(cfg_root_t *cfg, sqlite3 *sql, co
 		mqtt_rtlm_log("Error:: not found topics table name");
 		return NULL;
 	}
-	snprintf(szStmt, sizeof szStmt, "SELECT Retain, Topic, Value FROM %s WHERE "
-			"ConnID = '%s' AND MsgID = %d AND Topic LIKE '%s' %s;", 
+	psStmt = sqlite3_mprintf("SELECT Retain, Topic, Value FROM %s WHERE "
+			"ConnID = '%q' AND MsgID = %d AND Topic LIKE '%q' %s;", 
 			str, connid, msgid, topic, szStr);
 
-	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
+	if (sqlite3_prepare_v2(sql, psStmt, strlen(psStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_free(psStmt);
 		return NULL;
-	}
+	} else
+		sqlite3_free(psStmt);
 
 	/* calculate count of rows and allocate subscribe items */
 	while (sqlite3_step(stmt) == SQLITE_ROW)
@@ -460,8 +481,11 @@ mqtt_rtlm_read_topic(cfg_root_t *cfg, sqlite3 *sql, co
 		s[j].sub_ret = (char) sqlite3_column_int(stmt, 0);
 		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*) io_strdup((char*) sqlite3_column_text(stmt, 2));
-		s[j].sub_value.msg_len = strlen((char*) s[j].sub_value.msg_base);
+		AIT_SET_PTR(&v, (void*) sqlite3_column_blob(stmt, 2), sqlite3_column_bytes(stmt, 2));
+		s[j].sub_value.msg_len = AIT_LEN(&v);
+		s[j].sub_value.msg_base = (u_char*) io_malloc(s[j].sub_value.msg_len);
+		if (s[j].sub_value.msg_base)
+			memcpy(s[j].sub_value.msg_base, AIT_GET_PTR(&v), s[j].sub_value.msg_len);
 	}
 end:
 	sqlite3_finalize(stmt);
@@ -487,7 +511,7 @@ mqtt_rtlm_write_subscribe(cfg_root_t *cfg, sqlite3 *sq
 		const char *topic, const char *user, const char *host, char qos)
 {
 	int ret = 0;
-	char *str, szStmt[BUFSIZ] = { 0 };
+	char *str, *psStmt;
 	sqlite3_stmt *stmt;
 
 	if (!cfg || !sql || !topic)
@@ -498,15 +522,17 @@ 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 (ConnID, MsgID, QoS, Topic, PubUser, "
-			"PubDate, PubHost) VALUES ('%s', %d, %d, '%s', '%s', "
-			"datetime('now', 'localtime'), '%s');", str, 
+	psStmt = sqlite3_mprintf("INSERT INTO %s (ConnID, MsgID, QoS, Topic, PubUser, "
+			"PubDate, PubHost) VALUES ('%q', %d, %d, '%q', '%q', "
+			"datetime('now', 'localtime'), '%q');", str, 
 			connid, msgid, qos, topic, user, host);
 
-	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
+	if (sqlite3_prepare_v2(sql, psStmt, strlen(psStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_free(psStmt);
 		return -1;
-	}
+	} else
+		sqlite3_free(psStmt);
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
 		ret = sqlite3_changes(sql);
 	else {
@@ -535,7 +561,7 @@ mqtt_rtlm_delete_subscribe(cfg_root_t *cfg, sqlite3 *s
 		const char *topic, const char *user, const char *host)
 {
 	int ret = 0;
-	char *str, szStmt[BUFSIZ] = { 0 };
+	char *str, *psStmt;
 	sqlite3_stmt *stmt;
 
 	if (!cfg || !sql || !topic)
@@ -546,14 +572,16 @@ mqtt_rtlm_delete_subscribe(cfg_root_t *cfg, sqlite3 *s
 		mqtt_rtlm_log("Error:: not found subscribes table name");
 		return -1;
 	}
-	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE ConnID = '%s' AND "
-			"Topic LIKE '%s' AND PubUser LIKE '%s' AND PubHost LIKE '%s';", str, 
+	psStmt = sqlite3_mprintf("DELETE FROM %s WHERE ConnID = '%q' AND "
+			"Topic LIKE '%q' AND PubUser LIKE '%q' AND PubHost LIKE '%q';", str, 
 			connid, topic, user, host);
 
-	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
+	if (sqlite3_prepare_v2(sql, psStmt, strlen(psStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_free(psStmt);
 		return -1;
-	}
+	} else
+		sqlite3_free(psStmt);
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
 		ret = sqlite3_changes(sql);
 	else {
@@ -579,7 +607,7 @@ mqtt_subscr_t *
 mqtt_rtlm_read_subscribe(cfg_root_t *cfg, sqlite3 *sql, const char *connid, const char *topic)
 {
 	int rowz = 0;
-	char *str, szStmt[BUFSIZ] = { 0 };
+	char *str, *psStmt;
 	sqlite3_stmt *stmt;
 	register int j;
 	mqtt_subscr_t *s = NULL;
@@ -592,13 +620,15 @@ 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 ConnID = '%s' AND "
-			"Topic LIKE '%s';", str, connid, topic);
+	psStmt = sqlite3_mprintf("SELECT QoS, Topic FROM %s WHERE ConnID = '%q' AND "
+			"Topic LIKE '%q';", str, connid, topic);
 
-	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
+	if (sqlite3_prepare_v2(sql, psStmt, strlen(psStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
+		sqlite3_free(psStmt);
 		return NULL;
-	}
+	} else
+		sqlite3_free(psStmt);
 
 	/* calculate count of rows and allocate subscribe items */
 	while (sqlite3_step(stmt) == SQLITE_ROW)