Fix transition of network connection state

[connman] / src / plugin.c

diff --git a/src/plugin.c b/src/plugin.c
index 23caa0a..e5e2464 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -57,7 +57,7 @@ static gboolean add_plugin(void *handle, struct connman_plugin_desc *desc)
                return FALSE;
 
        if (g_str_equal(desc->version, CONNMAN_VERSION) == FALSE) {
-               DBG("version mismatch for %s", desc->description);
+               connman_error("Version mismatch for %s", desc->description);
                return FALSE;
        }
 
@@ -74,6 +74,24 @@ static gboolean add_plugin(void *handle, struct connman_plugin_desc *desc)
        return TRUE;
 }
 
+static gboolean check_plugin(struct connman_plugin_desc *desc,
+                               const char *pattern, const char *exclude)
+{
+       if (exclude != NULL &&
+                       g_pattern_match_simple(exclude, desc->name) == TRUE) {
+               connman_info("Excluding %s", desc->description);
+               return FALSE;
+       }
+
+       if (pattern != NULL &&
+                       g_pattern_match_simple(pattern, desc->name) == FALSE) {
+               connman_info("Ignoring %s", desc->description);
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
 #include "builtin.h"
 
 int __connman_plugin_init(const char *pattern, const char *exclude)
@@ -86,8 +104,13 @@ int __connman_plugin_init(const char *pattern, const char *exclude)
 
        DBG("");
 
-       for (i = 0; __connman_builtin[i]; i++)
+       for (i = 0; __connman_builtin[i]; i++) {
+               if (check_plugin(__connman_builtin[i],
+                                               pattern, exclude) == FALSE)
+                       continue;
+
                add_plugin(NULL, __connman_builtin[i]);
+       }
 
        dir = g_dir_open(PLUGINDIR, 0, NULL);
        if (dir != NULL) {
@@ -103,8 +126,8 @@ int __connman_plugin_init(const char *pattern, const char *exclude)
 
                        handle = dlopen(filename, RTLD_NOW);
                        if (handle == NULL) {
-                               g_warning("Can't load %s: %s", filename,
-                                                               dlerror());
+                               connman_error("Can't load %s: %s",
+                                                       filename, dlerror());
                                g_free(filename);
                                continue;
                        }
@@ -113,21 +136,13 @@ int __connman_plugin_init(const char *pattern, const char *exclude)
 
                        desc = dlsym(handle, "connman_plugin_desc");
                        if (desc == NULL) {
-                               g_warning("Can't load symbol: %s", dlerror());
-                               dlclose(handle);
-                               continue;
-                       }
-
-                       if (exclude != NULL && g_pattern_match_simple(exclude,
-                                                       desc->name) == TRUE) {
-                               DBG("excluding %s", desc->description);
+                               connman_error("Can't load symbol: %s",
+                                                               dlerror());
                                dlclose(handle);
                                continue;
                        }
 
-                       if (pattern != NULL && g_pattern_match_simple(pattern,
-                                                       desc->name) == FALSE) {
-                               DBG("ignoring %s", desc->description);
+                       if (check_plugin(desc, pattern, exclude) == FALSE) {
                                dlclose(handle);
                                continue;
                        }