Add generic shared lib loader

common/utils/load_module_shlib.c

@@ -0,0 +1,52 @@
+
+/* FT NOKBLF:
+ *  this source is to be linked with the program using the telnet server, it looks for
+ *  the telnet server dynamic library, possibly loads it and calls the telnet server
+ *  init functions
+*/
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <dlfcn.h>
+#include "openair1/PHY/defs.h"
+#define LOAD_MODULE_SHLIB_MAIN
+#include "load_module_shlib.h"
+int load_module_shlib(char *modname)
+{
+   void *lib_handle;
+   initfunc_t fpi;
+   char *tmpstr;
+   int ret=0;
+ 
+   tmpstr = malloc(strlen(modname)+16);
+   if (tmpstr == NULL) {
+      fprintf(stderr,"[LOADER] %s %d malloc error loading module %s, %s\n",__FILE__, __LINE__, modname, strerror(errno));
+      return -1; 
+   }
+   sprintf(tmpstr,"lib%s.so",modname);
+   lib_handle = dlopen(tmpstr, RTLD_LAZY|RTLD_NODELETE|RTLD_GLOBAL);
+   if (!lib_handle) {
+      printf("[LOADER] library %s is not loaded: %s\n", tmpstr,dlerror());
+      ret = -1;
+   } else {
+      sprintf(tmpstr,"init_%s",modname);
+      fpi = dlsym(lib_handle,tmpstr);
+
+      if (fpi != NULL )
+         {
+	 fpi();
+	 }
+      else
+         {
+         fprintf(stderr,"[LOADER] %s %d %s function not found %s\n",__FILE__, __LINE__, dlerror(),tmpstr);
+         ret =  -1;
+         }
+    } 
+	  	 
+   if (tmpstr != NULL) free(tmpstr);
+   if (lib_handle != NULL) dlclose(lib_handle); 
+   return ret;	       
+}

common/utils/load_module_shlib.h

@@ -0,0 +1,11 @@
+#ifndef LOAD_SHLIB_H
+#define LOAD_SHLIB_H
+
+
+typedef int(*initfunc_t)(void);
+#ifdef LOAD_MODULE_SHLIB_MAIN
+#else
+extern int load_module_shlib(char *modname);
+#endif
+
+#endif

common/utils/telnetsrv/CMakeLists.txt

@@ -8,8 +8,9 @@ ELSE()
 ENDIF()
 
 
-set(APPROOT . )
+
 set(OPENAIR_DIR $ENV{OPENAIR_DIR})
+set(APPROOT ${OPENAIR_DIR}/common/utils/telnetsrv )
 set(OPENAIR_BUILD_DIR $ENV{OPENAIR_DIR}/cmake_targets)
 set(OPENAIR1_DIR $ENV{OPENAIR1_DIR})
 set(OPENAIR2_DIR $ENV{OPENAIR2_DIR})

common/utils/telnetsrv/load_telnet.c

@@ -1,45 +0,0 @@
-
-/* FT NOKBLF:
- *  this source is to be linked with the program using the telnet server, it looks for
- *  the telnet server dynamic library, possibly loads it and calls the telnet server
- *  init functions
-*/
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <dlfcn.h>
-#include "telnetsrv.h"
-#include "openair1/PHY/defs.h"
-
-int load_telnet(void)
-{
-   void *lib_handle;
-   initfunc_t fpi;
-
- 
-   lib_handle = dlopen(TELNETSRV_SHAREDLIB, RTLD_LAZY|RTLD_NODELETE|RTLD_GLOBAL);
-   if (!lib_handle) 
-   {
-      printf("[TELNETSRV] telnet server is not loaded: %s\n", dlerror());
-      return -1;
-   } 
-   
-   fpi = dlsym(lib_handle,"init_telnetsrv");
-
-     if (fpi != NULL )
-         {
-	 fpi(cfgfile);
-	 }
-      else
-         {
-         fprintf(stderr,"[TELNETSRV] %s %d Telnet server init function not found %s\n",__FILE__, __LINE__, dlerror());
-         return -1;
-         } 
-	  	 
-
-   dlclose(lib_handle); 
-   return 0;	       
-}

common/utils/telnetsrv/load_telnet.h

@@ -1,5 +0,0 @@
-#ifndef TELNET_LOAD_H
-#define TELNET_LOAD_H
-#include "telnetsrv.h"
-extern int load_telnet(void);
-#endif

common/utils/telnetsrv/telnetsrv.h

@@ -1,7 +1,7 @@
 #ifndef TELNETSRV_H
 #define TELNETSRV_H
 
-#define TELNETSRV_SHAREDLIB "libtelnetsrv.so"
+#define TELNETSRV_MODNAME  "telnetsrv"
 
 #define TELNET_PORT               9090
 #define TELNET_MAX_MSGLENGTH      2048
@@ -80,7 +80,7 @@ typedef struct {
 
 
 typedef int(*addcmdfunc_t)(char*, telnetshell_vardef_t*, telnetshell_cmddef_t*);
-typedef int(*initfunc_t)(char *cfgfile);
+
 typedef void(*settelnetmodule_t)(char *name, void *ptr); 
 
 /*-------------------------------------------------------------------------------------------*/