--- mqtt/src/dl.c	2011/11/23 08:09:40	1.1.2.3
+++ mqtt/src/dl.c	2011/11/23 08:50:03	1.1.2.4
@@ -2,7 +2,7 @@
 #include "rtlm.h"
 
 
-static void *acc_rtlm, *pub_rtlm;
+static void *acc_rtlm, *pub_rtlm, *log_rtlm;
 
 
 /*
@@ -25,13 +25,27 @@ mqttLog(const char *fmt, ...)
 void *
 mqttLoadRTLM(sl_config *cfg, int modtype)
 {
-	const char *str;
+	const char *str, *attr;
 	void *rtlm = NULL;
+	void *(*mqttOpenRTLM)(sl_config *);
+	void (*mqttCloseRTLM)(void *);
 
 	if (!cfg)
 		return NULL;
 
-	str = (const char*) 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 = (const char*) CFG(cfg_GetAttribute(cfg, CFG("mqttd"), CFG(attr)));
 	if (!str) {
 		mqttLog("Error:: RTL module not found\n");
 		return NULL;
@@ -43,23 +57,35 @@ mqttLoadRTLM(sl_config *cfg, int modtype)
 		return NULL;
 	}
 
-	mqttOpenDB = dlsym(rtlm, "mqtt_db_open");
-	if (!mqttOpenDB) {
+	mqttOpenRTLM = dlsym(rtlm, "mqtt_rtlm_open");
+	if (!mqttOpenRTLM) {
 		mqttLog("Error:: Can't found mqtt_db_open call\n");
 		dlclose(rtlm);
 		return NULL;
 	}
-	mqttCloseDB = dlsym(rtlm, "mqtt_db_close");
-	if (!mqttCloseDB) {
+	mqttCloseRTLM = dlsym(rtlm, "mqtt_rtlm_close");
+	if (!mqttCloseRTLM) {
 		mqttLog("Error:: Can't found mqtt_db_close call\n");
 		dlclose(rtlm);
 		return NULL;
 	}
 
-	if (modtype) {
-		pub_rtlm = rtlm;
-	} else {
-		acc_rtlm = rtlm;
+	switch (modtype) {
+		case 0:
+			acc_rtlm = rtlm;
+			mqttOpenACC = mqttOpenRTLM;
+			mqttCloseACC = mqttCloseRTLM;
+			break;
+		case 1:
+			pub_rtlm = rtlm;
+			mqttOpenPUB = mqttOpenRTLM;
+			mqttClosePUB = mqttCloseRTLM;
+			break;
+		default:
+			log_rtlm = rtlm;
+			mqttOpenLOG = mqttOpenRTLM;
+			mqttCloseLOG = mqttCloseRTLM;
+			break;
 	}
 
 	return rtlm;
@@ -68,7 +94,17 @@ 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