#include <connman/plugin.h>
-int __connman_plugin_init(const char *pattern);
+int __connman_plugin_init(const char *pattern, const char *exclude);
void __connman_plugin_cleanup(void);
#include <connman/security.h>
#include <connman/element.h>
-int __connman_element_init(DBusConnection *conn, const char *device);
+int __connman_element_init(DBusConnection *conn, const char *device,
+ const char *nodevice);
void __connman_element_start(void);
void __connman_element_stop(void);
void __connman_element_cleanup(void);
static gchar *option_device = NULL;
static gchar *option_plugin = NULL;
+static gchar *option_nodevice = NULL;
+static gchar *option_noplugin = NULL;
static gboolean option_detach = TRUE;
static gboolean option_compat = FALSE;
static gboolean option_debug = FALSE;
static GOptionEntry options[] = {
{ "device", 'i', 0, G_OPTION_ARG_STRING, &option_device,
- "Specify network device/interface", "DEV" },
+ "Specify networking device or interface", "DEV" },
+ { "nodevice", 'I', 0, G_OPTION_ARG_STRING, &option_nodevice,
+ "Specify networking interface to ignore", "DEV" },
{ "plugin", 'p', 0, G_OPTION_ARG_STRING, &option_plugin,
"Specify plugins to load", "NAME" },
+ { "noplugin", 'P', 0, G_OPTION_ARG_STRING, &option_noplugin,
+ "Specify plugins not to load", "NAME" },
{ "nodaemon", 'n', G_OPTION_FLAG_REVERSE,
G_OPTION_ARG_NONE, &option_detach,
"Don't fork daemon to background" },
__connman_dbus_init(conn);
__connman_storage_init();
- __connman_element_init(conn, option_device);
+ __connman_element_init(conn, option_device, option_nodevice);
__connman_agent_init(conn);
__connman_manager_init(conn, option_compat);
__connman_rtnl_init();
__connman_udev_init();
- __connman_plugin_init(option_plugin);
+ __connman_plugin_init(option_plugin, option_noplugin);
__connman_element_start();
g_free(option_device);
g_free(option_plugin);
+ g_free(option_nodevice);
+ g_free(option_noplugin);
memset(&sa, 0, sizeof(sa));
sa.sa_handler = sig_term;
if (desc->init == NULL)
return FALSE;
- if (g_str_equal(desc->version, CONNMAN_VERSION) == FALSE)
+ if (g_str_equal(desc->version, CONNMAN_VERSION) == FALSE) {
+ DBG("version mismatch for %s", desc->description);
return FALSE;
+ }
plugin = g_try_new0(struct connman_plugin, 1);
if (plugin == NULL)
return TRUE;
}
-int __connman_plugin_init(const char *pattern)
+int __connman_plugin_init(const char *pattern, const char *exclude)
{
GDir *dir;
const gchar *file;
continue;
}
+ if (exclude != NULL && g_pattern_match_simple(exclude,
+ desc->name) == TRUE) {
+ DBG("excluding %s", desc->description);
+ dlclose(handle);
+ continue;
+ }
+
if (pattern != NULL && g_pattern_match_simple(pattern,
desc->name) == FALSE) {
DBG("ignoring %s", desc->description);