--- mqtt/src/dl.c 2011/11/24 15:34:18 1.1.2.9 +++ mqtt/src/dl.c 2012/02/01 15:44:40 1.2.2.2 @@ -55,7 +55,7 @@ mqttLoadRTLM(sl_config *cfg, int modtype) rtlm = dlopen(str, RTLD_LAZY); if (!rtlm) { - mqttLog("Error:: RTL module not found %s\n", dlerror()); + mqttLog("Error:: RTL module %s not found %s\n", str, dlerror()); return NULL; } @@ -78,6 +78,11 @@ mqttLoadRTLM(sl_config *cfg, int modtype) 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; @@ -86,12 +91,31 @@ mqttLoadRTLM(sl_config *cfg, int modtype) 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; }