*
* Connection Manager
*
- * Copyright (C) 2007-2008 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2009 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
g_main_loop_quit(main_loop);
}
-static gchar *option_interface = NULL;
+static void disconnect_callback(DBusConnection *conn, void *user_data)
+{
+ DBG("D-Bus disconnect");
+
+ g_main_loop_quit(main_loop);
+}
+
+static gchar *option_device = NULL;
static gboolean option_detach = TRUE;
+static gboolean option_selftest = FALSE;
static gboolean option_compat = FALSE;
static gboolean option_debug = FALSE;
static GOptionEntry options[] = {
- { "interface", 'i', 0, G_OPTION_ARG_STRING, &option_interface,
- "Specify network interface", "IFACE" },
+ { "device", 'i', 0, G_OPTION_ARG_STRING, &option_device,
+ "Specify network device/interface", "DEV" },
{ "nodaemon", 'n', G_OPTION_FLAG_REVERSE,
G_OPTION_ARG_NONE, &option_detach,
"Don't fork daemon to background" },
+ { "selftest", 't', 0, G_OPTION_ARG_NONE, &option_selftest,
+ "Run self testing routines" },
{ "compat", 'c', 0, G_OPTION_ARG_NONE, &option_compat,
"Enable Network Manager compatibility" },
{ "debug", 'd', 0, G_OPTION_ARG_NONE, &option_debug,
DBusError err;
struct sigaction sa;
+#ifdef NEED_THREADS
if (g_thread_supported() == FALSE)
g_thread_init(NULL);
+#endif
context = g_option_context_new(NULL);
g_option_context_add_main_entries(context, options, NULL);
main_loop = g_main_loop_new(NULL, FALSE);
+#ifdef NEED_THREADS
if (dbus_threads_init_default() == FALSE) {
fprintf(stderr, "Can't init usage of threads\n");
exit(1);
}
+#endif
dbus_error_init(&err);
exit(1);
}
+ g_dbus_set_disconnect_function(conn, disconnect_callback, NULL, NULL);
+
if (option_compat == TRUE) {
if (g_dbus_request_name(conn, NM_SERVICE, NULL) == FALSE) {
fprintf(stderr, "Can't register compat service\n");
__connman_log_init(option_detach, option_debug);
- __connman_element_init(conn);
+ if (option_selftest == TRUE) {
+ if (__connman_selftest() < 0) {
+ connman_error("Self testing routines failed");
+ goto selftest;
+ }
+ }
- __connman_agent_init(conn);
+ __connman_dbus_init(conn);
+
+ __connman_storage_init();
+ __connman_element_init(conn, option_device);
+ __connman_agent_init(conn);
__connman_manager_init(conn, option_compat);
+ __connman_profile_init(conn);
+
+ __connman_resolver_init();
+ __connman_rtnl_init();
+ __connman_udev_init();
__connman_plugin_init();
- g_free(option_interface);
+ __connman_element_start();
+
+ g_free(option_device);
memset(&sa, 0, sizeof(sa));
sa.sa_handler = sig_term;
g_main_loop_run(main_loop);
+ __connman_element_stop();
+
__connman_plugin_cleanup();
- __connman_manager_cleanup();
+ __connman_udev_cleanup();
+ __connman_rtnl_cleanup();
+ __connman_resolver_cleanup();
+ __connman_profile_cleanup();
+ __connman_manager_cleanup();
__connman_agent_cleanup();
__connman_element_cleanup();
+ __connman_storage_cleanup();
+
+ __connman_dbus_cleanup();
+selftest:
__connman_log_cleanup();
- g_dbus_cleanup_connection(conn);
+ dbus_connection_unref(conn);
g_main_loop_unref(main_loop);