--- mqtt/src/pubmqtt.c	2011/12/08 17:02:25	1.1.2.14
+++ mqtt/src/pubmqtt.c	2012/01/27 15:05:38	1.2
@@ -39,7 +39,10 @@ mqtt_rtlm_open(sl_config *cfg)
 	if (!cfg)
 		return NULL;
 
-	sqlite3_config(SQLITE_CONFIG_SERIALIZED);
+	/*
+	if (!sqlite3_threadsafe() || sqlite3_config(SQLITE_CONFIG_SERIALIZED))
+		return NULL;
+		*/
 
 	str = (const char*) cfg_GetAttribute(cfg, CFG("mqtt_pub"), CFG("name"));
 	if (!str) {
@@ -78,17 +81,16 @@ mqtt_rtlm_close(sqlite3 *sql)
  *
  * @cfg = loaded config
  * @sql = SQL handle
- * @user = username
  * @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 *connid, 
-		const char *host, u_short port, char will, ...)
+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;
@@ -104,14 +106,14 @@ mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, c
 		return -1;
 	}
 	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);
+		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 (Username, ConnID, RemoteHost, RemotePort, "
+		snprintf(szStmt, sizeof szStmt, "INSERT INTO %s (ConnID, Username, RemoteHost, "
 				"WillFlag, WillRetain, WillQoS, WillMsg, WillTopic) "
-				"VALUES ('%s', '%s', '%s', %d, %d, %d, %d, '%s', '%s');", 
-				str, user, connid, host, port, will, 
+				"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);
 	}
@@ -137,13 +139,13 @@ mqtt_rtlm_init_session(sl_config *cfg, sqlite3 *sql, c
  *
  * @cfg = loaded config
  * @sql = SQL handle
- * @user = username
  * @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 *connid, 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 };
@@ -157,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 ConnID = '%s' "
-			"AND RemoteHost LIKE '%s';", str, user, connid, 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);
@@ -181,13 +183,13 @@ mqtt_rtlm_fini_session(sl_config *cfg, sqlite3 *sql, c
  *
  * @cfg = loaded config
  * @sql = SQL handle
- * @user = username
  * @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 *connid, 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 };
@@ -201,9 +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 ConnID, RemoteHost, RemotePort FROM %s WHERE "
-			"Username = '%s' AND ConnID = '%s' AND RemoteHost LIKE '%s';", 
-			str, user, connid, 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);
@@ -388,10 +390,10 @@ 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 = 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));
-		s[j].sub_value._size = strlen(s[j].sub_value._base);
+		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);