--- mqtt/src/dl.c	2012/01/27 15:05:38	1.2
+++ mqtt/src/dl.c	2012/07/03 09:02:50	1.3
@@ -2,8 +2,6 @@
 #include "rtlm.h"
 
 
-static void *acc_rtlm, *pub_rtlm, *log_rtlm;
-
 struct tagCallbacks call;
 
 
@@ -25,11 +23,11 @@ mqttLog(const char *fmt, ...)
 }
 
 void *
-mqttLoadRTLM(sl_config *cfg, int modtype)
+mqttLoadRTLM(cfg_root_t *cfg, int modtype)
 {
 	const char *str, *attr;
 	void *rtlm = NULL;
-	void *(*mqttOpenRTLM)(sl_config *);
+	void *(*mqttOpenRTLM)(cfg_root_t *);
 	void (*mqttCloseRTLM)(void *);
 
 	if (!cfg)
@@ -47,13 +45,13 @@ mqttLoadRTLM(sl_config *cfg, int modtype)
 			break;
 	}
 
-	str = (const char*) CFG(cfg_GetAttribute(cfg, CFG("mqttd"), CFG(attr)));
+	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 %s not found %s\n", str, dlerror());
 		return NULL;
@@ -61,20 +59,19 @@ mqttLoadRTLM(sl_config *cfg, int modtype)
 
 	mqttOpenRTLM = dlsym(rtlm, "mqtt_rtlm_open");
 	if (!mqttOpenRTLM) {
-		mqttLog("Error:: Can't found mqtt_db_open call\n");
+		mqttLog("Error:: Can't found mqtt_rtlm_open call\n");
 		dlclose(rtlm);
 		return NULL;
 	}
 	mqttCloseRTLM = dlsym(rtlm, "mqtt_rtlm_close");
 	if (!mqttCloseRTLM) {
-		mqttLog("Error:: Can't found mqtt_db_close call\n");
+		mqttLog("Error:: Can't found mqtt_rtlm_close call\n");
 		dlclose(rtlm);
 		return NULL;
 	}
 
 	switch (modtype) {
 		case 0:
-			acc_rtlm = rtlm;
 			call.OpenACC = mqttOpenRTLM;
 			call.CloseACC = mqttCloseRTLM;
 			call.LoginACC = dlsym(rtlm, "mqtt_rtlm_login");
@@ -85,24 +82,28 @@ mqttLoadRTLM(sl_config *cfg, int modtype)
 			}
 			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 = dlsym(rtlm, "mqtt_rtlm_write_topic");
-			call.ReadPUB = dlsym(rtlm, "mqtt_rtlm_read_topic");
-			call.DeletePUB = dlsym(rtlm, "mqtt_rtlm_delete_topic");
+			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.WipePUB_topic = dlsym(rtlm, "mqtt_rtlm_wipe_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 || !call.ReadPUB || !call.DeletePUB) {
+					!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");
@@ -118,30 +119,21 @@ mqttLoadRTLM(sl_config *cfg, int modtype)
 }
 
 void
-mqttUnloadRTLM(int modtype)
+mqttUnloadRTLM(void *rtlm)
 {
-	switch (modtype) {
-		case 0:
-			dlclose(acc_rtlm);
-			break;
-		case 1:
-			dlclose(pub_rtlm);
-			break;
-		default:
-			dlclose(log_rtlm);
-			break;
-	}
+	if (rtlm)
+		dlclose(rtlm);
 }
 
 inline int
-mqttMkDir(sl_config *cfg)
+mqttMkDir(cfg_root_t *cfg)
 {
 	const char *str;
 
 	if (!cfg)
 		return -1;
 
-	str = (const char*) cfg_GetAttribute(cfg, CFG("mqttd"), CFG("statedir"));
+	str = (const char*) cfg_getAttribute(cfg, "mqttd", "statedir");
 	if (!str)
 		return -1;