X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmanager.c;h=1bf9189cc3bf59656e70eb1081d3f13eee0fdba1;hb=46d7e52dcabccff5e010a6aa7232fbbfea1abecb;hp=14ea6ca8c3b4ffeb6faffa2e6a9e25432690c90d;hpb=7260b267094d37ef067ed21a0252df361096148a;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/src/manager.c b/src/manager.c
index 14ea6ca..1bf9189 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  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
@@ -23,339 +23,298 @@
 #include <config.h>
 #endif
 
+#include <errno.h>
+
 #include <gdbus.h>
 
 #include "connman.h"
 
-enum connman_policy {
-	CONNMAN_POLICY_UNKNOWN  = 0,
-	CONNMAN_POLICY_SINGLE   = 1,
-	CONNMAN_POLICY_MULTIPLE = 2,
-	CONNMAN_POLICY_ASK      = 3,
-};
-
-static enum connman_policy global_policy = CONNMAN_POLICY_SINGLE;
-static connman_bool_t global_offlinemode = FALSE;
+static connman_bool_t connman_state_idle;
+static DBusMessage *session_mode_pending = NULL;
 
-static const char *policy2string(enum connman_policy policy)
+static DBusMessage *get_properties(DBusConnection *conn,
+					DBusMessage *msg, void *data)
 {
-	switch (policy) {
-	case CONNMAN_POLICY_UNKNOWN:
-		break;
-	case CONNMAN_POLICY_SINGLE:
-		return "single";
-	case CONNMAN_POLICY_MULTIPLE:
-		return "multiple";
-	case CONNMAN_POLICY_ASK:
-		return "ask";
-	}
+	DBusMessage *reply;
+	DBusMessageIter array, dict;
+	connman_bool_t offlinemode, sessionmode;
+	const char *str;
 
-	return NULL;
-}
+	DBG("conn %p", conn);
 
-static enum connman_policy string2policy(const char *policy)
-{
-	if (g_str_equal(policy, "single") == TRUE)
-		return CONNMAN_POLICY_SINGLE;
-	else if (g_str_equal(policy, "multiple") == TRUE)
-		return CONNMAN_POLICY_MULTIPLE;
-	else if (g_str_equal(policy, "ask") == TRUE)
-		return CONNMAN_POLICY_ASK;
-	else
-		return CONNMAN_POLICY_UNKNOWN;
-}
+	reply = dbus_message_new_method_return(msg);
+	if (reply == NULL)
+		return NULL;
 
-static void append_profiles(DBusMessageIter *dict)
-{
-	DBusMessageIter entry, value, iter;
-	const char *key = "Profiles";
+	dbus_message_iter_init_append(reply, &array);
 
-	dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
-								NULL, &entry);
+	connman_dbus_dict_open(&array, &dict);
 
-	dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+	str = __connman_notifier_get_state();
+	connman_dbus_dict_append_basic(&dict, "State",
+						DBUS_TYPE_STRING, &str);
 
-	dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-		DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
-								&value);
+	offlinemode = __connman_technology_get_offlinemode();
+	connman_dbus_dict_append_basic(&dict, "OfflineMode",
+					DBUS_TYPE_BOOLEAN, &offlinemode);
 
-	dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
-				DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-	__connman_profile_list(&iter);
-	dbus_message_iter_close_container(&value, &iter);
+	sessionmode = __connman_session_mode();
+	connman_dbus_dict_append_basic(&dict, "SessionMode",
+					DBUS_TYPE_BOOLEAN,
+					&sessionmode);
 
-	dbus_message_iter_close_container(&entry, &value);
+	connman_dbus_dict_close(&array, &dict);
 
-	dbus_message_iter_close_container(dict, &entry);
+	return reply;
 }
 
-static void append_services(DBusMessageIter *dict)
+static DBusMessage *set_property(DBusConnection *conn,
+					DBusMessage *msg, void *data)
 {
-	DBusMessageIter entry, value, iter;
-	const char *key = "Services";
-
-	dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
-								NULL, &entry);
+	DBusMessageIter iter, value;
+	const char *name;
+	int type;
 
-	dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+	DBG("conn %p", conn);
 
-	dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-		DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
-								&value);
+	if (dbus_message_iter_init(msg, &iter) == FALSE)
+		return __connman_error_invalid_arguments(msg);
 
-	dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
-				DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-	__connman_service_list(&iter);
-	dbus_message_iter_close_container(&value, &iter);
+	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+		return __connman_error_invalid_arguments(msg);
 
-	dbus_message_iter_close_container(&entry, &value);
+	dbus_message_iter_get_basic(&iter, &name);
+	dbus_message_iter_next(&iter);
 
-	dbus_message_iter_close_container(dict, &entry);
-}
+	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
+		return __connman_error_invalid_arguments(msg);
 
-static void append_devices(DBusMessageIter *dict)
-{
-	DBusMessageIter entry, value, iter;
-	const char *key = "Devices";
+	dbus_message_iter_recurse(&iter, &value);
 
-	dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
-								NULL, &entry);
+	type = dbus_message_iter_get_arg_type(&value);
 
-	dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+	if (g_str_equal(name, "OfflineMode") == TRUE) {
+		connman_bool_t offlinemode;
 
-	dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-		DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
-								&value);
+		if (type != DBUS_TYPE_BOOLEAN)
+			return __connman_error_invalid_arguments(msg);
 
-	dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
-				DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-	__connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
-	dbus_message_iter_close_container(&value, &iter);
+		dbus_message_iter_get_basic(&value, &offlinemode);
 
-	dbus_message_iter_close_container(&entry, &value);
+		__connman_technology_set_offlinemode(offlinemode);
+	} else if (g_str_equal(name, "SessionMode") == TRUE) {
+		connman_bool_t sessionmode;
 
-	dbus_message_iter_close_container(dict, &entry);
-}
+		if (type != DBUS_TYPE_BOOLEAN)
+			return __connman_error_invalid_arguments(msg);
 
-static void append_connections(DBusMessageIter *dict)
-{
-	DBusMessageIter entry, value, iter;
-	const char *key = "Connections";
+		dbus_message_iter_get_basic(&value, &sessionmode);
 
-	dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
-								NULL, &entry);
+		if (session_mode_pending != NULL)
+			return __connman_error_in_progress(msg);
 
-	dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+		__connman_session_set_mode(sessionmode);
 
-	dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-		DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
-								&value);
+		if (sessionmode == TRUE && connman_state_idle == FALSE) {
+			session_mode_pending = msg;
+			return NULL;
+		}
 
-	dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
-				DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-	__connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
-	dbus_message_iter_close_container(&value, &iter);
+	} else
+		return __connman_error_invalid_property(msg);
 
-	dbus_message_iter_close_container(&entry, &value);
+	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
 
-	dbus_message_iter_close_container(dict, &entry);
+static void append_technology_structs(DBusMessageIter *iter, void *user_data)
+{
+	__connman_technology_list_struct(iter);
 }
 
-static DBusMessage *get_properties(DBusConnection *conn,
-					DBusMessage *msg, void *data)
+static DBusMessage *get_technologies(DBusConnection *conn,
+		DBusMessage *msg, void *data)
 {
 	DBusMessage *reply;
-	DBusMessageIter array, dict;
-	const char *str;
-
-	DBG("conn %p", conn);
 
-	if (__connman_security_check_privilege(msg,
-					CONNMAN_SECURITY_PRIVILEGE_PUBLIC) < 0)
-		return __connman_error_permission_denied(msg);
+	DBG("");
 
 	reply = dbus_message_new_method_return(msg);
 	if (reply == NULL)
 		return NULL;
 
-	dbus_message_iter_init_append(reply, &array);
+	__connman_dbus_append_objpath_dict_array(reply,
+			append_technology_structs, NULL);
 
-	dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
-			DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
-			DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
-			DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+	return reply;
+}
 
-	str = __connman_profile_active_path();
-	if (str != NULL)
-		connman_dbus_dict_append_variant(&dict, "ActiveProfile",
-						DBUS_TYPE_OBJECT_PATH, &str);
+static DBusMessage *remove_provider(DBusConnection *conn,
+				    DBusMessage *msg, void *data)
+{
+	const char *path;
+	int err;
 
-	append_profiles(&dict);
-	append_services(&dict);
+	DBG("conn %p", conn);
 
-	append_devices(&dict);
-	append_connections(&dict);
+	dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
+							DBUS_TYPE_INVALID);
 
-	if (__connman_element_count(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION) > 0)
-		str = "online";
-	else
-		str = "offline";
+	err = __connman_provider_remove(path);
+	if (err < 0)
+		return __connman_error_failed(msg, -err);
 
-	connman_dbus_dict_append_variant(&dict, "State",
-						DBUS_TYPE_STRING, &str);
+	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
 
-	str = policy2string(global_policy);
-	if (str != NULL)
-		connman_dbus_dict_append_variant(&dict, "Policy",
-						DBUS_TYPE_STRING, &str);
+static DBusConnection *connection = NULL;
 
-	connman_dbus_dict_append_variant(&dict, "OfflineMode",
-				DBUS_TYPE_BOOLEAN, &global_offlinemode);
+static void session_mode_notify(void)
+{
+	DBusMessage *reply;
 
-	dbus_message_iter_close_container(&array, &dict);
+	reply = g_dbus_create_reply(session_mode_pending, DBUS_TYPE_INVALID);
+	g_dbus_send_message(connection, reply);
 
-	return reply;
+	dbus_message_unref(session_mode_pending);
+	session_mode_pending = NULL;
 }
 
-static DBusMessage *set_property(DBusConnection *conn,
-					DBusMessage *msg, void *data)
+static void idle_state(connman_bool_t idle)
 {
-	DBusMessageIter iter, value;
-	const char *name;
 
-	DBG("conn %p", conn);
-
-	if (dbus_message_iter_init(msg, &iter) == FALSE)
-		return __connman_error_invalid_arguments(msg);
-
-	dbus_message_iter_get_basic(&iter, &name);
-	dbus_message_iter_next(&iter);
-	dbus_message_iter_recurse(&iter, &value);
-
-	if (__connman_security_check_privilege(msg,
-					CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
-		return __connman_error_permission_denied(msg);
+	DBG("idle %d", idle);
 
-	if (g_str_equal(name, "Policy") == TRUE) {
-		enum connman_policy policy;
-		const char *str;
+	connman_state_idle = idle;
 
-		dbus_message_iter_get_basic(&value, &str);
-		policy = string2policy(str);
-		if (policy == CONNMAN_POLICY_UNKNOWN)
-			return __connman_error_invalid_arguments(msg);
-
-		global_policy = policy;
-	} else if (g_str_equal(name, "OfflineMode") == TRUE) {
-		connman_bool_t offlinemode;
+	if (connman_state_idle == FALSE || session_mode_pending == NULL)
+		return;
 
-		dbus_message_iter_get_basic(&value, &offlinemode);
+	session_mode_notify();
+}
 
-		if (global_offlinemode == offlinemode)
-			return __connman_error_invalid_arguments(msg);
+static struct connman_notifier technology_notifier = {
+	.name		= "manager",
+	.priority	= CONNMAN_NOTIFIER_PRIORITY_HIGH,
+	.idle_state	= idle_state,
+};
 
-		global_offlinemode = offlinemode;
+static void append_service_structs(DBusMessageIter *iter, void *user_data)
+{
+	__connman_service_list_struct(iter);
+}
 
-		__connman_device_set_offlinemode(offlinemode);
-	} else if (g_str_equal(name, "ActiveProfile") == TRUE) {
-		const char *str;
+static DBusMessage *get_services(DBusConnection *conn,
+					DBusMessage *msg, void *data)
+{
+	DBusMessage *reply;
 
-		dbus_message_iter_get_basic(&value, &str);
+	reply = dbus_message_new_method_return(msg);
+	if (reply == NULL)
+		return NULL;
 
-		return __connman_error_not_supported(msg);
-	}
+	__connman_dbus_append_objpath_dict_array(reply,
+			append_service_structs, NULL);
 
-	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+	return reply;
 }
 
-static DBusMessage *add_profile(DBusConnection *conn,
+static DBusMessage *connect_provider(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	const char *name;
+	int err;
 
 	DBG("conn %p", conn);
 
-	dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &name,
-							DBUS_TYPE_INVALID);
+	if (__connman_session_mode() == TRUE) {
+		connman_info("Session mode enabled: "
+				"direct provider connect disabled");
+
+		return __connman_error_failed(msg, -EINVAL);
+	}
+
+	err = __connman_provider_create_and_connect(msg);
+	if (err < 0) {
+		if (err == -EINPROGRESS) {
+			connman_error("Invalid return code from connect");
+			err = -EINVAL;
+		}
+
+		return __connman_error_failed(msg, -err);
+	}
 
-	return __connman_error_not_supported(msg);
+	return NULL;
 }
 
-static DBusMessage *remove_profile(DBusConnection *conn,
+static DBusMessage *register_agent(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	const char *path;
+	const char *sender, *path;
+	int err;
 
 	DBG("conn %p", conn);
 
+	sender = dbus_message_get_sender(msg);
+
 	dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
 							DBUS_TYPE_INVALID);
 
-	return __connman_error_not_supported(msg);
+	err = __connman_agent_register(sender, path);
+	if (err < 0)
+		return __connman_error_failed(msg, -err);
+
+	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
-static DBusMessage *connect_service(DBusConnection *conn,
+static DBusMessage *unregister_agent(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	DBusMessageIter iter, array;
+	const char *sender, *path;
+	int err;
 
 	DBG("conn %p", conn);
 
-	if (__connman_security_check_privilege(msg,
-					CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
-		return __connman_error_permission_denied(msg);
-
-	dbus_message_iter_init(msg, &iter);
-	dbus_message_iter_recurse(&iter, &array);
-
-	while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_DICT_ENTRY) {
-		DBusMessageIter entry, value;
-		const char *key;
-
-		dbus_message_iter_recurse(&array, &entry);
-		dbus_message_iter_get_basic(&entry, &key);
-
-		dbus_message_iter_next(&entry);
-		dbus_message_iter_recurse(&entry, &value);
+	sender = dbus_message_get_sender(msg);
 
-		switch (dbus_message_iter_get_arg_type(&value)) {
-		}
+	dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
+							DBUS_TYPE_INVALID);
 
-		dbus_message_iter_next(&array);
-	}
+	err = __connman_agent_unregister(sender, path);
+	if (err < 0)
+		return __connman_error_failed(msg, -err);
 
-	return __connman_error_not_implemented(msg);
+	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
-static DBusMessage *register_agent(DBusConnection *conn,
+static DBusMessage *register_counter(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	DBusMessage *reply;
 	const char *sender, *path;
+	unsigned int accuracy, period;
+	int err;
 
 	DBG("conn %p", conn);
 
 	sender = dbus_message_get_sender(msg);
 
 	dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
+						DBUS_TYPE_UINT32, &accuracy,
+						DBUS_TYPE_UINT32, &period,
 							DBUS_TYPE_INVALID);
 
-	reply = dbus_message_new_method_return(msg);
-	if (reply == NULL)
-		return NULL;
-
-	dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+	/* FIXME: add handling of accuracy parameter */
 
-	__connman_agent_register(sender, path);
+	err = __connman_counter_register(sender, path, period);
+	if (err < 0)
+		return __connman_error_failed(msg, -err);
 
-	return reply;
+	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
-static DBusMessage *unregister_agent(DBusConnection *conn,
+static DBusMessage *unregister_counter(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	DBusMessage *reply;
 	const char *sender, *path;
+	int err;
 
 	DBG("conn %p", conn);
 
@@ -364,134 +323,171 @@ static DBusMessage *unregister_agent(DBusConnection *conn,
 	dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
 							DBUS_TYPE_INVALID);
 
-	reply = dbus_message_new_method_return(msg);
-	if (reply == NULL)
-		return NULL;
+	err = __connman_counter_unregister(sender, path);
+	if (err < 0)
+		return __connman_error_failed(msg, -err);
 
-	dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
 
-	__connman_agent_unregister(sender, path);
+static DBusMessage *create_session(DBusConnection *conn,
+					DBusMessage *msg, void *data)
+{
+	int err;
 
-	return reply;
-}
+	DBG("conn %p", conn);
 
-static GDBusMethodTable manager_methods[] = {
-	{ "GetProperties",   "",      "a{sv}", get_properties   },
-	{ "SetProperty",     "sv",    "",      set_property     },
-	{ "AddProfile",      "s",     "o",     add_profile      },
-	{ "RemoveProfile",   "o",     "",      remove_profile   },
-	{ "ConnectService",  "a{sv}", "o",     connect_service  },
-	{ "RegisterAgent",   "o",     "",      register_agent   },
-	{ "UnregisterAgent", "o",     "",      unregister_agent },
-	{ },
-};
+	err = __connman_session_create(msg);
+	if (err < 0)
+		return __connman_error_failed(msg, -err);
 
-static GDBusSignalTable manager_signals[] = {
-	{ "PropertyChanged", "sv" },
-	{ "StateChanged",    "s"  },
-	{ },
-};
+	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
 
-static DBusMessage *nm_sleep(DBusConnection *conn,
+static DBusMessage *destroy_session(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	DBusMessage *reply;
+	int err;
 
 	DBG("conn %p", conn);
 
-	reply = dbus_message_new_method_return(msg);
-	if (reply == NULL)
-		return NULL;
-
-	dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+	err = __connman_session_destroy(msg);
+	if (err < 0)
+		return __connman_error_failed(msg, -err);
 
-	return reply;
+	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
-static DBusMessage *nm_wake(DBusConnection *conn,
+static DBusMessage *request_private_network(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	DBusMessage *reply;
+	const char *sender;
+	int  err;
 
 	DBG("conn %p", conn);
 
-	reply = dbus_message_new_method_return(msg);
-	if (reply == NULL)
-		return NULL;
+	sender = dbus_message_get_sender(msg);
 
-	dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+	err = __connman_private_network_request(msg, sender);
+	if (err < 0)
+		return __connman_error_failed(msg, -err);
 
-	return reply;
+	return NULL;
 }
 
-enum {
-	NM_STATE_UNKNOWN = 0,
-	NM_STATE_ASLEEP,
-	NM_STATE_CONNECTING,
-	NM_STATE_CONNECTED,
-	NM_STATE_DISCONNECTED
-};
-
-static DBusMessage *nm_state(DBusConnection *conn,
+static DBusMessage *release_private_network(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	DBusMessage *reply;
-	dbus_uint32_t state;
+	const char *path;
+	int err;
 
 	DBG("conn %p", conn);
 
-	reply = dbus_message_new_method_return(msg);
-	if (reply == NULL)
-		return NULL;
-
-	state = NM_STATE_DISCONNECTED;
-
-	dbus_message_append_args(reply, DBUS_TYPE_UINT32, &state,
+	dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
 							DBUS_TYPE_INVALID);
 
-	return reply;
+	err = __connman_private_network_release(path);
+	if (err < 0)
+		return __connman_error_failed(msg, -err);
+
+	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
-static GDBusMethodTable nm_methods[] = {
-	{ "sleep", "",  "",   nm_sleep        },
-	{ "wake",  "",  "",   nm_wake         },
-	{ "state", "",  "u",  nm_state        },
+static const GDBusMethodTable manager_methods[] = {
+	{ GDBUS_METHOD("GetProperties",
+			NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
+			get_properties) },
+	{ GDBUS_ASYNC_METHOD("SetProperty",
+			GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
+			NULL, set_property) },
+	{ GDBUS_METHOD("GetTechnologies",
+			NULL, GDBUS_ARGS({ "technologies", "a(oa{sv})" }),
+			get_technologies) },
+	{ GDBUS_METHOD("RemoveProvider",
+			GDBUS_ARGS({ "provider", "o" }), NULL,
+			remove_provider) },
+	{ GDBUS_METHOD("GetServices",
+			NULL, GDBUS_ARGS({ "services", "a(oa{sv})" }),
+			get_services) },
+	{ GDBUS_ASYNC_METHOD("ConnectProvider",
+			      GDBUS_ARGS({ "provider", "a{sv}" }),
+			      GDBUS_ARGS({ "path", "o" }),
+			      connect_provider) },
+	{ GDBUS_METHOD("RegisterAgent",
+			GDBUS_ARGS({ "path", "o" }), NULL,
+			register_agent) },
+	{ GDBUS_METHOD("UnregisterAgent",
+			GDBUS_ARGS({ "path", "o" }), NULL,
+			unregister_agent) },
+	{ GDBUS_METHOD("RegisterCounter",
+			GDBUS_ARGS({ "path", "o" }, { "accuracy", "u" },
+					{ "period", "u" }),
+			NULL, register_counter) },
+	{ GDBUS_METHOD("UnregisterCounter",
+			GDBUS_ARGS({ "path", "o" }), NULL,
+			unregister_counter) },
+	{ GDBUS_METHOD("CreateSession",
+			GDBUS_ARGS({ "settings", "a{sv}" },
+						{ "notifier", "o" }),
+			GDBUS_ARGS({ "session", "o" }),
+			create_session) },
+	{ GDBUS_METHOD("DestroySession",
+			GDBUS_ARGS({ "session", "o" }), NULL,
+			destroy_session) },
+	{ GDBUS_ASYNC_METHOD("RequestPrivateNetwork",
+			      NULL, GDBUS_ARGS({ "path", "o" },
+					       { "settings", "a{sv}" },
+					       { "socket", "h" }),
+			      request_private_network) },
+	{ GDBUS_METHOD("ReleasePrivateNetwork",
+			GDBUS_ARGS({ "path", "o" }), NULL,
+			release_private_network) },
 	{ },
 };
 
-static DBusConnection *connection = NULL;
-static gboolean nm_compat = FALSE;
+static const GDBusSignalTable manager_signals[] = {
+	{ GDBUS_SIGNAL("PropertyChanged",
+			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
+	{ GDBUS_SIGNAL("TechnologyAdded",
+			GDBUS_ARGS({ "path", "o" },
+				   { "properties", "a{sv}" })) },
+	{ GDBUS_SIGNAL("TechnologyRemoved",
+			GDBUS_ARGS({ "path", "o" })) },
+	{ GDBUS_SIGNAL("ServicesChanged",
+			GDBUS_ARGS({ "changed", "a(oa{sv})" },
+					{ "removed", "ao" })) },
+	{ },
+};
 
-int __connman_manager_init(DBusConnection *conn, gboolean compat)
+int __connman_manager_init(void)
 {
-	DBG("conn %p", conn);
+	DBG("");
 
-	connection = dbus_connection_ref(conn);
+	connection = connman_dbus_get_connection();
 	if (connection == NULL)
 		return -1;
 
+	if (connman_notifier_register(&technology_notifier) < 0)
+		connman_error("Failed to register technology notifier");
+
 	g_dbus_register_interface(connection, CONNMAN_MANAGER_PATH,
 					CONNMAN_MANAGER_INTERFACE,
 					manager_methods,
 					manager_signals, NULL, NULL, NULL);
 
-	if (compat == TRUE) {
-		g_dbus_register_interface(connection, NM_PATH, NM_INTERFACE,
-					nm_methods, NULL, NULL, NULL, NULL);
-
-		nm_compat = TRUE;
-	}
+	connman_state_idle = TRUE;
 
 	return 0;
 }
 
 void __connman_manager_cleanup(void)
 {
-	DBG("conn %p", connection);
+	DBG("");
 
-	if (nm_compat == TRUE) {
-		g_dbus_unregister_interface(connection, NM_PATH, NM_INTERFACE);
-	}
+	if (connection == NULL)
+		return;
+
+	connman_notifier_unregister(&technology_notifier);
 
 	g_dbus_unregister_interface(connection, CONNMAN_MANAGER_PATH,
 						CONNMAN_MANAGER_INTERFACE);