--- mqtt/inc/rtlm.h	2012/01/27 15:05:38	1.2
+++ mqtt/inc/rtlm.h	2012/07/03 09:02:50	1.3
@@ -4,30 +4,37 @@
 
 void mqttLog(const char *, ...);
 
-void *mqttLoadRTLM(sl_config*, int);
-void mqttUnloadRTLM(int);
+void *mqttLoadRTLM(cfg_root_t*, int);
+void mqttUnloadRTLM(void*);
 
-inline int mqttMkDir(sl_config *);
+inline int mqttMkDir(cfg_root_t *);
 
 
 struct tagCallbacks {
 	/* mqtt_acc.so */
-	void *(*OpenACC)(sl_config *);
+	void *(*OpenACC)(cfg_root_t *);
 	void (*CloseACC)(void *);
-	int (*LoginACC)(sl_config *, void *, const char*, const char*);
+	int (*LoginACC)(cfg_root_t *, void *, const char*, const char*);
 
 	/* mqtt_pub.so */
-	void *(*OpenPUB)(sl_config *);
+	void *(*OpenPUB)(cfg_root_t *);
 	void (*ClosePUB)(void *);
-	int (*InitSessPUB)(sl_config *, void *, const char*, const char*, const char*, char, ...);
-	int (*FiniSessPUB)(sl_config *, void *, const char*, const char*, const char*);
-	int (*ChkSessPUB)(sl_config *, void *, const char*, const char*, const char*);
-	int (*WritePUB)(sl_config *, void *, u_short, const char*, const char*, const char*, const char*, char);
-	mqtt_subscr_t *(*ReadPUB)(sl_config *, void *, u_short, const char*, char);
-	int (*DeletePUB)(sl_config *, void *, u_short, const char*, const char*, const char*, char);
+	int (*InitSessPUB)(cfg_root_t *, void *, const char*, const char*, const char*, char, ...);
+	int (*FiniSessPUB)(cfg_root_t *, void *, const char*, const char*, const char*);
+	int (*ChkSessPUB)(cfg_root_t *, void *, const char*, const char*, const char*);
 
+	int (*WritePUB_topic)(cfg_root_t *, void *, const char*, u_short, const char*, void *, int,  
+			const char*, const char*, char, char);
+	mqtt_subscr_t *(*ReadPUB_topic)(cfg_root_t *, void *, const char*, const char*, char);
+	int (*DeletePUB_topic)(cfg_root_t *, void *, const char*, u_short, const char*, const char*, const char*, char);
+	int (*WipePUB_topic)(cfg_root_t *, void *, const char*, const char*, char);
+
+	int (*WritePUB_subscribe)(cfg_root_t *, void *, const char*, u_short, const char*, const char*, const char*, char);
+	mqtt_subscr_t *(*ReadPUB_subscribe)(cfg_root_t *, void *, const char*, const char*);
+	int (*DeletePUB_subscribe)(cfg_root_t *, void *, const char*, const char*, const char*, const char*);
+
 	/* mqtt_log.so */
-	void *(*OpenLOG)(sl_config *);
+	void *(*OpenLOG)(cfg_root_t *);
 	void (*CloseLOG)(void *);
 	int (*LOG)(void *, const char *, ...);
 };