--- mqtt/src/dl.c	2011/11/23 01:07:18	1.1.2.2
+++ mqtt/src/dl.c	2012/04/24 13:54:50	1.2.2.5
@@ -2,9 +2,11 @@
 #include "rtlm.h"
 
 
-static void *acc_rtlm, *pub_rtlm;
+static void *acc_rtlm, *pub_rtlm, *log_rtlm;
 
+struct tagCallbacks call;
 
+
 /*
  * mqttLog() Log message to syslog
  *
@@ -23,43 +25,98 @@ mqttLog(const char *fmt, ...)
 }
 
 void *
-mqttLoadRTLM(sl_config *cfg, int modtype)
+mqttLoadRTLM(cfg_root_t *cfg, int modtype)
 {
-	char *str;
+	const char *str, *attr;
 	void *rtlm = NULL;
+	void *(*mqttOpenRTLM)(cfg_root_t *);
+	void (*mqttCloseRTLM)(void *);
 
 	if (!cfg)
 		return NULL;
 
-	str = CFG(cfg_GetAttribute(cfg, CFG("mqttd"), CFG(modtype ? "pub_file" : "acc_file")));
+	switch (modtype) {
+		case 0:
+			attr = "acc_file";
+			break;
+		case 1:
+			attr = "pub_file";
+			break;
+		default:
+			attr = "log_file";
+			break;
+	}
+
+	str = cfg_getAttribute(cfg, "mqttd", attr);
 	if (!str) {
 		mqttLog("Error:: RTL module not found\n");
 		return NULL;
 	}
 
-	rtlm = dlopen(str, RTLD_LAZY);
+	rtlm = dlopen(str, RTLD_NOW);
 	if (!rtlm) {
-		mqttLog("Error:: RTL module not found %s\n", dlerror());
+		mqttLog("Error:: RTL module %s not found %s\n", str, dlerror());
 		return NULL;
 	}
 
-	mqttOpenDB = dlsym(rtlm, "mqtt_db_open");
-	if (!mqttOpenDB) {
-		mqttLog("Error:: Can't found mqtt_db_open call\n");
+	mqttOpenRTLM = dlsym(rtlm, "mqtt_rtlm_open");
+	if (!mqttOpenRTLM) {
+		mqttLog("Error:: Can't found mqtt_rtlm_open call\n");
 		dlclose(rtlm);
 		return NULL;
 	}
-	mqttCloseDB = dlsym(rtlm, "mqtt_db_close");
-	if (!mqttCloseDB) {
-		mqttLog("Error:: Can't found mqtt_db_close call\n");
+	mqttCloseRTLM = dlsym(rtlm, "mqtt_rtlm_close");
+	if (!mqttCloseRTLM) {
+		mqttLog("Error:: Can't found mqtt_rtlm_close call\n");
 		dlclose(rtlm);
 		return NULL;
 	}
 
-	if (modtype) {
-		pub_rtlm = rtlm;
-	} else {
-		acc_rtlm = rtlm;
+	switch (modtype) {
+		case 0:
+			acc_rtlm = rtlm;
+			call.OpenACC = mqttOpenRTLM;
+			call.CloseACC = mqttCloseRTLM;
+			call.LoginACC = dlsym(rtlm, "mqtt_rtlm_login");
+			if (!call.LoginACC) {
+				mqttLog("Error:: incorrect module ...\n");
+				dlclose(rtlm);
+				return NULL;
+			}
+			break;
+		case 1:
+			pub_rtlm = rtlm;
+			call.OpenPUB = mqttOpenRTLM;
+			call.ClosePUB = mqttCloseRTLM;
+			call.InitSessPUB = dlsym(rtlm, "mqtt_rtlm_init_session");
+			call.FiniSessPUB = dlsym(rtlm, "mqtt_rtlm_fini_session");
+			call.ChkSessPUB = dlsym(rtlm, "mqtt_rtlm_chk_session");
+			call.WritePUB_topic = dlsym(rtlm, "mqtt_rtlm_write_topic");
+			call.ReadPUB_topic = dlsym(rtlm, "mqtt_rtlm_read_topic");
+			call.DeletePUB_topic = dlsym(rtlm, "mqtt_rtlm_delete_topic");
+			call.WritePUB_subscribe = dlsym(rtlm, "mqtt_rtlm_write_subscribe");
+			call.ReadPUB_subscribe = dlsym(rtlm, "mqtt_rtlm_read_subscribe");
+			call.DeletePUB_subscribe = dlsym(rtlm, "mqtt_rtlm_delete_subscribe");
+			if (!call.InitSessPUB || !call.FiniSessPUB || !call.ChkSessPUB || 
+					!call.WritePUB_topic || !call.ReadPUB_topic || 
+					!call.DeletePUB_topic || !call.WritePUB_subscribe || 
+					!call.ReadPUB_subscribe || !call.DeletePUB_subscribe) {
+				mqttLog("Error:: incorrect module ...\n");
+				dlclose(rtlm);
+				return NULL;
+			}
+			break;
+		default:
+			log_rtlm = rtlm;
+			call.OpenLOG = mqttOpenRTLM;
+			call.CloseLOG = mqttCloseRTLM;
+			call.LOG = dlsym(rtlm, "mqtt_rtlm_logger");
+			if (!call.LOG) {
+				mqttLog("Error:: incorrect module ...\n");
+				dlclose(rtlm);
+				return NULL;
+			}
+			break;
 	}
 
 	return rtlm;
@@ -68,18 +125,28 @@ mqttLoadRTLM(sl_config *cfg, int modtype)
 void
 mqttUnloadRTLM(int modtype)
 {
-	dlclose((modtype ? pub_rtlm : acc_rtlm));
+	switch (modtype) {
+		case 0:
+			dlclose(acc_rtlm);
+			break;
+		case 1:
+			dlclose(pub_rtlm);
+			break;
+		default:
+			dlclose(log_rtlm);
+			break;
+	}
 }
 
 inline int
-mqttMkDir(sl_config *cfg)
+mqttMkDir(cfg_root_t *cfg)
 {
-	char *str;
+	const char *str;
 
 	if (!cfg)
 		return -1;
 
-	str = CFG(cfg_GetAttribute(cfg, CFG("mqttd"), CFG("statedir")));
+	str = (const char*) cfg_getAttribute(cfg, "mqttd", "statedir");
 	if (!str)
 		return -1;