FreeTDM: Move I/O interface lookup code into common ftdm_global_get_io_interface()

Auto-loading can be toggled by setting the new autoload parameter
to FTDM_FALSE/FTDM_TRUE.

Update ftdm_span_create() and ftdm_api_execute() to use the new code.

NOTE: Auto-loading of missing I/O interfaces remains enabled in both cases,
      but I guess we should disable it for ftdm_api_execute().

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 20d4fc69ef61b401ef803e450a48f8afa4d19d42..c6a322eed01adc8e3bcc543418bb34fa160dfbfe 100644 (file)
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -854,15 +854,7 @@ FT_DECLARE(ftdm_status_t) ftdm_span_create(const char *iotype, const char *name,
        
        *span = NULL;
 
-       ftdm_mutex_lock(globals.mutex);
-       if (!(fio = (ftdm_io_interface_t *) hashtable_search(globals.interface_hash, (void *)iotype))) {
-               ftdm_load_module_assume(iotype);
-               if ((fio = (ftdm_io_interface_t *) hashtable_search(globals.interface_hash, (void *)iotype))) {
-                       ftdm_log(FTDM_LOG_INFO, "Auto-loaded I/O module '%s'\n", iotype);
-               }
-       }
-       ftdm_mutex_unlock(globals.mutex);
-
+       fio = ftdm_global_get_io_interface(iotype, FTDM_TRUE);
        if (!fio) {
                ftdm_log(FTDM_LOG_CRIT, "failure creating span, no such I/O type '%s'\n", iotype);
                return FTDM_FAIL;
@@ -4968,22 +4960,14 @@ FT_DECLARE(char *) ftdm_api_execute(const char *cmd)
        if (!strcasecmp(type, "core")) {
                return handle_core_command(cmd);
        }
-       
-       ftdm_mutex_lock(globals.mutex);
-       if (!(fio = (ftdm_io_interface_t *) hashtable_search(globals.interface_hash, (void *)type))) {
-               ftdm_load_module_assume(type);
-               if ((fio = (ftdm_io_interface_t *) hashtable_search(globals.interface_hash, (void *)type))) {
-                       ftdm_log(FTDM_LOG_INFO, "auto-loaded '%s'\n", type);
-               }
-       }
-       ftdm_mutex_unlock(globals.mutex);
 
+       fio = ftdm_global_get_io_interface(type, FTDM_TRUE);
        if (fio && fio->api) {
                ftdm_stream_handle_t stream = { 0 };
                ftdm_status_t status;
                FTDM_STANDARD_STREAM(stream);
+
                status = fio->api(&stream, cmd);
-               
                if (status != FTDM_SUCCESS) {
                        ftdm_safe_free(stream.data);
                } else {
@@ -4992,7 +4976,7 @@ FT_DECLARE(char *) ftdm_api_execute(const char *cmd)
        }
 
        ftdm_safe_free(dup);
-       
+
        return rval;
 }
 
@@ -5474,6 +5458,25 @@ FT_DECLARE(ftdm_status_t) ftdm_global_add_io_interface(ftdm_io_interface_t *inte
        return ret;
 }
 
+FT_DECLARE(ftdm_io_interface_t *) ftdm_global_get_io_interface(const char *iotype, ftdm_bool_t autoload)
+{
+       ftdm_io_interface_t *fio = NULL;
+
+       ftdm_mutex_lock(globals.mutex);
+
+       fio = (ftdm_io_interface_t *) hashtable_search(globals.interface_hash, (void *)iotype);
+       if (!fio && autoload) {
+               ftdm_load_module_assume(iotype);
+               fio = (ftdm_io_interface_t *) hashtable_search(globals.interface_hash, (void *)iotype);
+               if (fio) {
+                       ftdm_log(FTDM_LOG_INFO, "Auto-loaded I/O module '%s'\n", iotype);
+               }
+       }
+
+       ftdm_mutex_unlock(globals.mutex);
+       return fio;
+}
+
 FT_DECLARE(int) ftdm_load_module(const char *name)
 {
        ftdm_dso_lib_t lib;

diff --git a/libs/freetdm/src/include/freetdm.h b/libs/freetdm/src/include/freetdm.h
index 1a035655d2387ed5105e0470352c3d89c636a9df..cc6ddd02ee36d79e68b5ca84770b164ab9f25337 100755 (executable)
--- a/libs/freetdm/src/include/freetdm.h
+++ b/libs/freetdm/src/include/freetdm.h
@@ -1711,6 +1711,16 @@ FT_DECLARE(ftdm_status_t) ftdm_span_stop(ftdm_span_t *span);
  */
 FT_DECLARE(ftdm_status_t) ftdm_global_add_io_interface(ftdm_io_interface_t *io_interface);
 
+/**
+ * Get I/O interface by name
+ *
+ * \param iotype    Name of interface
+ * \param autoload  Try to load missing plugins
+ * \retval I/O interface handle on success
+ * \retval NULL on failure
+ */
+FT_DECLARE(ftdm_io_interface_t *) ftdm_global_get_io_interface(const char *iotype, ftdm_bool_t autoload);
+
 /*! \brief Find a span by name */
 FT_DECLARE(ftdm_status_t) ftdm_span_find_by_name(const char *name, ftdm_span_t **span);