X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmanager.c;h=4f8306a153c2590bcec5b6f9a394e8303b753fa8;hb=f2a9f93bbb2df62e3b3246ea253f8aaae29234d2;hp=722d6216e9df6b90964ab4bc9a4423bba56b8f88;hpb=ea81b3269f9f507a6be8d139662e1c1d387e9417;p=platform%2Fupstream%2Fconnman.git

diff --git a/src/manager.c b/src/manager.c
old mode 100644
new mode 100755
index 722d621..4f8306a
--- a/src/manager.c
+++ b/src/manager.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2013  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
@@ -27,65 +27,51 @@
 
 #include <gdbus.h>
 
+#include <connman/agent.h>
+
 #include "connman.h"
 
+static bool connman_state_idle;
+static dbus_bool_t sessionmode;
+
 static DBusMessage *get_properties(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
 	DBusMessage *reply;
 	DBusMessageIter array, dict;
-	connman_bool_t offlinemode, sessionmode;
+	dbus_bool_t offlinemode;
 	const char *str;
+#if defined TIZEN_EXT
+	dbus_bool_t autoconnectmode;
+#endif
 
 	DBG("conn %p", conn);
 
 	reply = dbus_message_new_method_return(msg);
-	if (reply == NULL)
+	if (!reply)
 		return NULL;
 
 	dbus_message_iter_init_append(reply, &array);
 
 	connman_dbus_dict_open(&array, &dict);
 
-	str = __connman_profile_active_path();
-	if (str != NULL)
-		connman_dbus_dict_append_basic(&dict, "ActiveProfile",
-						DBUS_TYPE_OBJECT_PATH, &str);
-
-	connman_dbus_dict_append_array(&dict, "Services",
-			DBUS_TYPE_OBJECT_PATH, __connman_service_list, NULL);
-	connman_dbus_dict_append_array(&dict, "Technologies",
-			DBUS_TYPE_OBJECT_PATH, __connman_technology_list, NULL);
-
 	str = __connman_notifier_get_state();
 	connman_dbus_dict_append_basic(&dict, "State",
 						DBUS_TYPE_STRING, &str);
 
-	offlinemode = __connman_profile_get_offlinemode();
+	offlinemode = __connman_technology_get_offlinemode();
 	connman_dbus_dict_append_basic(&dict, "OfflineMode",
 					DBUS_TYPE_BOOLEAN, &offlinemode);
 
-	connman_dbus_dict_append_array(&dict, "AvailableTechnologies",
-		DBUS_TYPE_STRING, __connman_notifier_list_registered, NULL);
-	connman_dbus_dict_append_array(&dict, "EnabledTechnologies",
-		DBUS_TYPE_STRING, __connman_notifier_list_enabled, NULL);
-	connman_dbus_dict_append_array(&dict, "ConnectedTechnologies",
-		DBUS_TYPE_STRING, __connman_notifier_list_connected, NULL);
-
-	str = __connman_service_default();
-	if (str != NULL)
-		connman_dbus_dict_append_basic(&dict, "DefaultTechnology",
-						DBUS_TYPE_STRING, &str);
-
-	connman_dbus_dict_append_array(&dict, "AvailableDebugs",
-			DBUS_TYPE_STRING, __connman_debug_list_available, NULL);
-	connman_dbus_dict_append_array(&dict, "EnabledDebugs",
-			DBUS_TYPE_STRING, __connman_debug_list_enabled, NULL);
-
-	sessionmode = __connman_session_mode();
 	connman_dbus_dict_append_basic(&dict, "SessionMode",
 					DBUS_TYPE_BOOLEAN,
 					&sessionmode);
+#if defined TIZEN_EXT
+	autoconnectmode = __connman_service_get_auto_connect_mode();
+	connman_dbus_dict_append_basic(&dict, "AutoConnectMode",
+					DBUS_TYPE_BOOLEAN,
+					&autoconnectmode);
+#endif
 
 	connman_dbus_dict_close(&array, &dict);
 
@@ -101,58 +87,76 @@ static DBusMessage *set_property(DBusConnection *conn,
 
 	DBG("conn %p", conn);
 
-	if (dbus_message_iter_init(msg, &iter) == FALSE)
+	if (!dbus_message_iter_init(msg, &iter))
+		return __connman_error_invalid_arguments(msg);
+
+	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
 		return __connman_error_invalid_arguments(msg);
 
 	dbus_message_iter_get_basic(&iter, &name);
 	dbus_message_iter_next(&iter);
+
+	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
+		return __connman_error_invalid_arguments(msg);
+
 	dbus_message_iter_recurse(&iter, &value);
 
 	type = dbus_message_iter_get_arg_type(&value);
 
-	if (g_str_equal(name, "OfflineMode") == TRUE) {
-		connman_bool_t offlinemode;
+	if (g_str_equal(name, "OfflineMode")) {
+		dbus_bool_t offlinemode;
 
 		if (type != DBUS_TYPE_BOOLEAN)
 			return __connman_error_invalid_arguments(msg);
 
 		dbus_message_iter_get_basic(&value, &offlinemode);
 
-		__connman_profile_set_offlinemode(offlinemode, TRUE);
-
-		__connman_profile_save_default();
-	} else if (g_str_equal(name, "ActiveProfile") == TRUE) {
-		const char *str;
+		__connman_technology_set_offlinemode(offlinemode);
+	} else if (g_str_equal(name, "SessionMode")) {
 
-		dbus_message_iter_get_basic(&value, &str);
+		if (type != DBUS_TYPE_BOOLEAN)
+			return __connman_error_invalid_arguments(msg);
 
-		return __connman_error_not_supported(msg);
-	} else if (g_str_equal(name, "SessionMode") == TRUE) {
-		connman_bool_t sessionmode;
+		dbus_message_iter_get_basic(&value, &sessionmode);
+#if defined TIZEN_EXT
+	} else if (g_str_equal(name, "AutoConnectMode") == TRUE) {
+		bool automode;
 
 		if (type != DBUS_TYPE_BOOLEAN)
 			return __connman_error_invalid_arguments(msg);
 
-		dbus_message_iter_get_basic(&value, &sessionmode);
+		dbus_message_iter_get_basic(&value, &automode);
 
-		__connman_session_set_mode(sessionmode);
+		__connman_service_set_auto_connect_mode(automode);
+#endif
 	} else
 		return __connman_error_invalid_property(msg);
 
 	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
-static DBusMessage *get_state(DBusConnection *conn,
-					DBusMessage *msg, void *data)
+static void append_technology_structs(DBusMessageIter *iter, void *user_data)
 {
-	const char *str;
+	__connman_technology_list_struct(iter);
+}
 
-	DBG("conn %p", conn);
+static DBusMessage *get_technologies(DBusConnection *conn,
+		DBusMessage *msg, void *data)
+{
+	DBusMessage *reply;
 
-	str = __connman_notifier_get_state();
+#if !defined TIZEN_EXT
+	DBG("");
+#endif
+
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
+
+	__connman_dbus_append_objpath_dict_array(reply,
+			append_technology_structs, NULL);
 
-	return g_dbus_create_reply(msg, DBUS_TYPE_STRING, &str,
-						DBUS_TYPE_INVALID);
+	return reply;
 }
 
 static DBusMessage *remove_provider(DBusConnection *conn,
@@ -166,291 +170,164 @@ static DBusMessage *remove_provider(DBusConnection *conn,
 	dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
 							DBUS_TYPE_INVALID);
 
-	err = __connman_provider_remove(path);
+	err = __connman_provider_remove_by_path(path);
 	if (err < 0)
 		return __connman_error_failed(msg, -err);
 
 	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
-static DBusMessage *request_scan(DBusConnection *conn,
-					DBusMessage *msg, void *data)
-{
-	enum connman_service_type type;
-	const char *str;
-	int err;
-
-	DBG("conn %p", conn);
-
-	dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &str,
-							DBUS_TYPE_INVALID);
-
-	if (g_strcmp0(str, "") == 0)
-		type = CONNMAN_SERVICE_TYPE_UNKNOWN;
-	else if (g_strcmp0(str, "wifi") == 0)
-		type = CONNMAN_SERVICE_TYPE_WIFI;
-	else if (g_strcmp0(str, "wimax") == 0)
-		type = CONNMAN_SERVICE_TYPE_WIMAX;
-	else
-		return __connman_error_invalid_arguments(msg);
-
-	err = __connman_device_request_scan(type);
-	if (err < 0) {
-		if (err == -EINPROGRESS) {
-			connman_error("Invalid return code from scan");
-			err = -EINVAL;
-		}
-
-		return __connman_error_failed(msg, -err);
-	}
-
-	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
 static DBusConnection *connection = NULL;
 
-static enum connman_service_type technology_type;
-static connman_bool_t technology_enabled;
-static DBusMessage *technology_pending = NULL;
-static guint technology_timeout = 0;
-
-static void technology_reply(int error)
-{
-	DBG("");
-
-	if (technology_timeout > 0) {
-		g_source_remove(technology_timeout);
-		technology_timeout = 0;
-	}
-
-	if (technology_pending != NULL) {
-		if (error > 0) {
-			DBusMessage *reply;
-
-			reply = __connman_error_failed(technology_pending,
-								error);
-			if (reply != NULL)
-				g_dbus_send_message(connection, reply);
-		} else
-			g_dbus_send_reply(connection, technology_pending,
-							DBUS_TYPE_INVALID);
-
-		dbus_message_unref(technology_pending);
-		technology_pending = NULL;
-	}
-
-	technology_type = CONNMAN_SERVICE_TYPE_UNKNOWN;
-}
-
-static gboolean technology_abort(gpointer user_data)
+static void idle_state(bool idle)
 {
-	DBG("");
 
-	technology_timeout = 0;
+	DBG("idle %d", idle);
 
-	technology_reply(ETIMEDOUT);
+	connman_state_idle = idle;
 
-	return FALSE;
-}
-
-static void technology_notify(enum connman_service_type type,
-						connman_bool_t enabled)
-{
-	DBG("type %d enabled %d", type, enabled);
-
-	if (type == technology_type && enabled == technology_enabled)
-		technology_reply(0);
+	if (!connman_state_idle)
+		return;
 }
 
-static struct connman_notifier technology_notifier = {
+static const struct connman_notifier technology_notifier = {
 	.name		= "manager",
 	.priority	= CONNMAN_NOTIFIER_PRIORITY_HIGH,
-	.service_enabled= technology_notify,
+	.idle_state	= idle_state,
 };
 
-static DBusMessage *enable_technology(DBusConnection *conn,
-					DBusMessage *msg, void *data)
+static void append_service_structs(DBusMessageIter *iter, void *user_data)
 {
-	enum connman_service_type type;
-	const char *str;
-	int err;
-
-	DBG("conn %p", conn);
-
-	if (technology_pending != NULL)
-		return __connman_error_in_progress(msg);
-
-	dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &str,
-							DBUS_TYPE_INVALID);
-
-	if (g_strcmp0(str, "ethernet") == 0)
-		type = CONNMAN_SERVICE_TYPE_ETHERNET;
-	else if (g_strcmp0(str, "wifi") == 0)
-		type = CONNMAN_SERVICE_TYPE_WIFI;
-	else if (g_strcmp0(str, "wimax") == 0)
-		type = CONNMAN_SERVICE_TYPE_WIMAX;
-	else if (g_strcmp0(str, "bluetooth") == 0)
-		type = CONNMAN_SERVICE_TYPE_BLUETOOTH;
-	else if (g_strcmp0(str, "cellular") == 0)
-		type = CONNMAN_SERVICE_TYPE_CELLULAR;
-	else
-		return __connman_error_invalid_arguments(msg);
-
-	if (__connman_notifier_is_registered(type) == FALSE)
-		return __connman_error_not_registered(msg);
-
-	if (__connman_notifier_is_enabled(type) == TRUE)
-		return __connman_error_already_enabled(msg);
-
-	technology_type = type;
-	technology_enabled = TRUE;
-	technology_pending = dbus_message_ref(msg);
-
-	err = __connman_device_enable_technology(type);
-	if (err < 0 && err != -EINPROGRESS)
-		technology_reply(-err);
-	else
-		technology_timeout = g_timeout_add_seconds(15,
-						technology_abort, NULL);
-
-	return NULL;
+	__connman_service_list_struct(iter);
 }
 
-static DBusMessage *disable_technology(DBusConnection *conn,
+static DBusMessage *get_services(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	enum connman_service_type type;
-	const char *str;
-	int err;
-
-	DBG("conn %p", conn);
-
-	if (technology_pending != NULL)
-		return __connman_error_in_progress(msg);
-
-	dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &str,
-							DBUS_TYPE_INVALID);
-
-	if (g_strcmp0(str, "ethernet") == 0)
-		type = CONNMAN_SERVICE_TYPE_ETHERNET;
-	else if (g_strcmp0(str, "wifi") == 0)
-		type = CONNMAN_SERVICE_TYPE_WIFI;
-	else if (g_strcmp0(str, "wimax") == 0)
-		type = CONNMAN_SERVICE_TYPE_WIMAX;
-	else if (g_strcmp0(str, "bluetooth") == 0)
-		type = CONNMAN_SERVICE_TYPE_BLUETOOTH;
-	else if (g_strcmp0(str, "cellular") == 0)
-		type = CONNMAN_SERVICE_TYPE_CELLULAR;
-	else
-		return __connman_error_invalid_arguments(msg);
-
-	if (__connman_notifier_is_registered(type) == FALSE)
-		return __connman_error_not_registered(msg);
-
-	if (__connman_notifier_is_enabled(type) == FALSE)
-		return __connman_error_already_disabled(msg);
+	DBusMessage *reply;
 
-	technology_type = type;
-	technology_enabled = FALSE;
-	technology_pending = dbus_message_ref(msg);
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
 
-	err = __connman_device_disable_technology(type);
-	if (err < 0 && err != -EINPROGRESS)
-		technology_reply(-err);
-	else
-		technology_timeout = g_timeout_add_seconds(10,
-						technology_abort, NULL);
+	__connman_dbus_append_objpath_dict_array(reply,
+			append_service_structs, NULL);
 
-	return NULL;
+	return reply;
 }
 
-static DBusMessage *get_services(DBusConnection *conn,
-					DBusMessage *msg, void *data)
+#if defined TIZEN_EXT
+static DBusMessage *get_interfaces(DBusConnection *conn, DBusMessage *msg, void *data)
 {
 	DBusMessage *reply;
 	DBusMessageIter iter, array;
+	const char *default_interface = connman_option_get_string("DefaultWifiInterface");
+
+	DBG("DefaultWifiInterface %s", default_interface);
 
 	reply = dbus_message_new_method_return(msg);
-	if (reply == NULL)
+	if (!reply)
 		return NULL;
 
 	dbus_message_iter_init_append(reply, &iter);
-
 	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
-			DBUS_STRUCT_BEGIN_CHAR_AS_STRING
-			DBUS_TYPE_OBJECT_PATH_AS_STRING
-			DBUS_TYPE_ARRAY_AS_STRING
-				DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
-					DBUS_TYPE_STRING_AS_STRING
-					DBUS_TYPE_VARIANT_AS_STRING
-				DBUS_DICT_ENTRY_END_CHAR_AS_STRING
-			DBUS_STRUCT_END_CHAR_AS_STRING, &array);
+					DBUS_TYPE_STRING_AS_STRING, &array);
 
-	__connman_service_list_struct(&array);
+	dbus_message_iter_append_basic(&array,
+				DBUS_TYPE_STRING, &default_interface);
 
-	dbus_message_iter_close_container(&iter, &array);
+	__connman_technology_append_interfaces(&array,
+			CONNMAN_SERVICE_TYPE_WIFI, default_interface);
 
+	dbus_message_iter_close_container(&iter, &array);
 	return reply;
 }
 
-static DBusMessage *lookup_service(DBusConnection *conn,
+static DBusMessage *get_default_service(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	const char *pattern, *path;
-	int err;
+	struct connman_service *service = connman_service_get_default_connection();
+	DBG("service %p", service);
 
-	DBG("conn %p", conn);
+	return connman_service_create_dbus_service_reply(msg, service);
+}
 
-	dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &pattern,
+static DBusMessage *get_connected_service(DBusConnection *conn,
+					DBusMessage *msg, void *data)
+{
+	const char *ifname;
+	struct connman_service *service;
+
+	dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &ifname,
 							DBUS_TYPE_INVALID);
 
-	err = __connman_service_lookup(pattern, &path);
-	if (err < 0)
-		return __connman_error_failed(msg, -err);
+	service = connman_service_get_connected_service(ifname);
+	DBG("Interface Name %s, service %p", ifname, service);
 
-	return g_dbus_create_reply(msg, DBUS_TYPE_OBJECT_PATH, &path,
-							DBUS_TYPE_INVALID);
+	return connman_service_create_dbus_service_reply(msg, service);
+}
+#endif
+
+#if defined TIZEN_EXT_INS
+static void append_ins_structs(DBusMessageIter *iter, void *user_data)
+{
+	__connman_ins_list_struct(iter);
 }
 
-static DBusMessage *connect_service(DBusConnection *conn,
+static DBusMessage *get_ins(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
-	int err;
+	DBusMessage *reply;
 
-	DBG("conn %p", conn);
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
 
-	if (__connman_session_mode() == TRUE) {
-		connman_info("Session mode enabled: "
-				"direct service connect disabled");
+	__connman_dbus_append_objpath_dict_array(reply,
+			append_ins_structs, NULL);
 
-		return __connman_error_failed(msg, -EINVAL);
-	}
+	return reply;
+}
+#endif
 
-	err = __connman_service_create_and_connect(msg);
-	if (err < 0) {
-		if (err == -EINPROGRESS) {
-			connman_error("Invalid return code from connect");
-			err = -EINVAL;
-		}
+static void append_peer_structs(DBusMessageIter *iter, void *user_data)
+{
+	__connman_peer_list_struct(iter);
+}
 
-		return __connman_error_failed(msg, -err);
-	}
+static DBusMessage *get_peers(DBusConnection *conn,
+					DBusMessage *msg, void *data)
+{
+	DBusMessage *reply;
 
-	return NULL;
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
+
+	__connman_dbus_append_objpath_dict_array(reply,
+					append_peer_structs, NULL);
+	return reply;
 }
 
-static DBusMessage *provision_service(DBusConnection *conn, DBusMessage *msg,
-					void *data)
+static DBusMessage *get_tethering_clients(DBusConnection *conn,
+					DBusMessage *msg, void *data)
 {
-	int err;
+	DBusMessage *reply;
+	DBusMessageIter iter, array;
 
-	DBG("conn %p", conn);
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
 
-	err = __connman_service_provision(msg);
-	if (err < 0)
-		return __connman_error_failed(msg, -err);
+	dbus_message_iter_init_append(reply, &iter);
 
-	return NULL;
+	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+				DBUS_TYPE_STRING_AS_STRING, &array);
+
+	__connman_tethering_list_clients(&array);
+
+	dbus_message_iter_close_container(&iter, &array);
+	return reply;
 }
 
 static DBusMessage *connect_provider(DBusConnection *conn,
@@ -460,22 +337,9 @@ static DBusMessage *connect_provider(DBusConnection *conn,
 
 	DBG("conn %p", conn);
 
-	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;
-		}
-
+	if (err < 0)
 		return __connman_error_failed(msg, -err);
-	}
 
 	return NULL;
 }
@@ -493,7 +357,7 @@ static DBusMessage *register_agent(DBusConnection *conn,
 	dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
 							DBUS_TYPE_INVALID);
 
-	err = __connman_agent_register(sender, path);
+	err = connman_agent_register(sender, path);
 	if (err < 0)
 		return __connman_error_failed(msg, -err);
 
@@ -513,7 +377,7 @@ static DBusMessage *unregister_agent(DBusConnection *conn,
 	dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
 							DBUS_TYPE_INVALID);
 
-	err = __connman_agent_unregister(sender, path);
+	err = connman_agent_unregister(sender, path);
 	if (err < 0)
 		return __connman_error_failed(msg, -err);
 
@@ -573,8 +437,12 @@ static DBusMessage *create_session(DBusConnection *conn,
 	DBG("conn %p", conn);
 
 	err = __connman_session_create(msg);
-	if (err < 0)
+	if (err < 0) {
+		if (err == -EINPROGRESS)
+			return NULL;
+
 		return __connman_error_failed(msg, -err);
+	}
 
 	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
@@ -628,41 +496,345 @@ static DBusMessage *release_private_network(DBusConnection *conn,
 	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
-static GDBusMethodTable manager_methods[] = {
-	{ "GetProperties",     "",      "a{sv}", get_properties     },
-	{ "SetProperty",       "sv",    "",      set_property       },
-	{ "GetState",          "",      "s",     get_state          },
-	{ "RemoveProvider",    "o",     "",      remove_provider    },
-	{ "RequestScan",       "s",     "",      request_scan       },
-	{ "EnableTechnology",  "s",     "",      enable_technology,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "DisableTechnology", "s",     "",      disable_technology,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "GetServices",       "",      "a(oa{sv})", get_services   },
-	{ "LookupService",     "s",     "o",     lookup_service,    },
-	{ "ConnectService",    "a{sv}", "o",     connect_service,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "ProvisionService",  "s",     "",      provision_service,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "ConnectProvider",   "a{sv}", "o",     connect_provider,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "RegisterAgent",     "o",     "",      register_agent     },
-	{ "UnregisterAgent",   "o",     "",      unregister_agent   },
-	{ "RegisterCounter",   "ouu",   "",      register_counter   },
-	{ "UnregisterCounter", "o",     "",      unregister_counter },
-	{ "CreateSession",     "a{sv}o", "o",    create_session     },
-	{ "DestroySession",    "o",     "",      destroy_session    },
-	{ "RequestPrivateNetwork",    "",     "oa{sv}h",
-						request_private_network,
-						G_DBUS_METHOD_FLAG_ASYNC },
-	{ "ReleasePrivateNetwork",    "o",    "",
-						release_private_network },
+static int parse_peers_service_specs(DBusMessageIter *array,
+			const unsigned char **spec, int *spec_len,
+			const unsigned char **query, int *query_len,
+			int *version)
+{
+	*spec = *query = NULL;
+	*spec_len = *query_len = *version = 0;
+
+	while (dbus_message_iter_get_arg_type(array) ==
+							DBUS_TYPE_DICT_ENTRY) {
+		DBusMessageIter entry, inter, 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, &inter);
+
+		if  (!g_strcmp0(key, "BonjourResponse")) {
+			dbus_message_iter_recurse(&inter, &value);
+			dbus_message_iter_get_fixed_array(&value,
+							spec, spec_len);
+		} else if (!g_strcmp0(key, "BonjourQuery")) {
+			dbus_message_iter_recurse(&inter, &value);
+			dbus_message_iter_get_fixed_array(&value,
+							query, query_len);
+		} else if (!g_strcmp0(key, "UpnpService")) {
+			dbus_message_iter_get_basic(&inter, spec);
+			*spec_len = strlen((const char *)*spec)+1;
+		} else if (!g_strcmp0(key, "UpnpVersion")) {
+			dbus_message_iter_get_basic(&inter, version);
+		} else if (!g_strcmp0(key, "WiFiDisplayIEs")) {
+			if (*spec || *query)
+				return -EINVAL;
+
+			dbus_message_iter_recurse(&inter, &value);
+			dbus_message_iter_get_fixed_array(&value,
+							spec, spec_len);
+		} else
+			return -EINVAL;
+
+		dbus_message_iter_next(array);
+	}
+
+	if ((*query && !*spec && !*version) ||
+				(!*spec && !*query) || (!*spec && *version))
+		return -EINVAL;
+
+	return 0;
+}
+
+static DBusMessage *register_peer_service(DBusConnection *conn,
+						DBusMessage *msg, void *data)
+{
+	const unsigned char *spec, *query;
+	DBusMessageIter iter, array;
+	int spec_len, query_len;
+	dbus_bool_t master;
+	const char *owner;
+	int version;
+	int ret;
+
+	DBG("");
+
+	owner = dbus_message_get_sender(msg);
+
+	dbus_message_iter_init(msg, &iter);
+	dbus_message_iter_recurse(&iter, &array);
+
+	ret = parse_peers_service_specs(&array, &spec, &spec_len,
+						&query, &query_len, &version);
+	if (ret)
+		goto error;
+
+	dbus_message_iter_next(&iter);
+	dbus_message_iter_get_basic(&iter, &master);
+
+	ret = __connman_peer_service_register(owner, msg, spec, spec_len,
+					query, query_len, version,master);
+	if (!ret)
+		return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+	if (ret == -EINPROGRESS)
+		return NULL;
+error:
+	return __connman_error_failed(msg, -ret);
+}
+
+static DBusMessage *unregister_peer_service(DBusConnection *conn,
+						DBusMessage *msg, void *data)
+{
+	const unsigned char *spec, *query;
+	DBusMessageIter iter, array;
+	int spec_len, query_len;
+	const char *owner;
+	int version;
+	int ret;
+
+	DBG("");
+
+	owner = dbus_message_get_sender(msg);
+
+	dbus_message_iter_init(msg, &iter);
+	dbus_message_iter_recurse(&iter, &array);
+
+	ret = parse_peers_service_specs(&array, &spec, &spec_len,
+						&query, &query_len, &version);
+	if (ret)
+		goto error;
+
+	ret = __connman_peer_service_unregister(owner, spec, spec_len,
+						query, query_len, version);
+	if (!ret)
+		return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+error:
+	return __connman_error_failed(msg, -ret);
+
+}
+
+#if defined TIZEN_EXT_WIFI_MESH
+static void append_mesh_peer_structs(DBusMessageIter *iter, void *user_data)
+{
+	__connman_mesh_peer_list_struct(iter);
+}
+
+static DBusMessage *get_mesh_peers(DBusConnection *conn,
+					DBusMessage *msg, void *data)
+{
+	DBusMessage *reply;
+
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
+
+	__connman_dbus_append_objpath_dict_array(reply,
+					append_mesh_peer_structs, NULL);
+	return reply;
+}
+
+static DBusMessage *get_connected_mesh_peers(DBusConnection *conn,
+					DBusMessage *msg, void *data)
+{
+	DBusMessage *reply;
+	DBusMessageIter iter, array;
+
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
+
+	dbus_message_iter_init_append(reply, &iter);
+	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+			DBUS_STRUCT_BEGIN_CHAR_AS_STRING
+			DBUS_TYPE_ARRAY_AS_STRING
+				DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+					DBUS_TYPE_STRING_AS_STRING
+					DBUS_TYPE_VARIANT_AS_STRING
+				DBUS_DICT_ENTRY_END_CHAR_AS_STRING
+			DBUS_STRUCT_END_CHAR_AS_STRING, &array);
+
+	__connman_mesh_connected_peer_list_struct(&array);
+	dbus_message_iter_close_container(&iter, &array);
+	return reply;
+}
+
+static DBusMessage *get_disconnected_mesh_peers(DBusConnection *conn,
+					DBusMessage *msg, void *data)
+{
+	DBusMessage *reply;
+	DBusMessageIter iter, array;
+
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
+
+	dbus_message_iter_init_append(reply, &iter);
+	dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
+			DBUS_STRUCT_BEGIN_CHAR_AS_STRING
+			DBUS_TYPE_ARRAY_AS_STRING
+				DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
+					DBUS_TYPE_STRING_AS_STRING
+					DBUS_TYPE_VARIANT_AS_STRING
+				DBUS_DICT_ENTRY_END_CHAR_AS_STRING
+			DBUS_STRUCT_END_CHAR_AS_STRING, &array);
+
+	__connman_mesh_disconnected_peer_list_struct(&array);
+	dbus_message_iter_close_container(&iter, &array);
+	return reply;
+}
+
+static DBusMessage *mesh_add_peer(DBusConnection *conn,
+					DBusMessage *msg, void *user_data)
+{
+	const char *addr;
+	int err;
+
+	dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &addr,
+							DBUS_TYPE_INVALID);
+
+	DBG("Address %s", addr);
+
+	err = __connman_mesh_change_peer_status(msg, addr, CONNMAN_MESH_PEER_ADD);
+	if (err < 0)
+		return __connman_error_failed(msg, -err);
+
+	return NULL;
+}
+
+static DBusMessage *mesh_remove_peer(DBusConnection *conn,
+					DBusMessage *msg, void *user_data)
+{
+	const char *addr;
+	int err;
+
+	dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &addr,
+							DBUS_TYPE_INVALID);
+
+	DBG("Address %s", addr);
+
+	err = __connman_mesh_change_peer_status(msg, addr,
+										CONNMAN_MESH_PEER_REMOVE);
+	if (err < 0)
+		return __connman_error_failed(msg, -err);
+
+	return NULL;
+}
+#endif
+
+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_DEPRECATED_METHOD("RemoveProvider",
+			GDBUS_ARGS({ "provider", "o" }), NULL,
+			remove_provider) },
+	{ GDBUS_METHOD("GetServices",
+			NULL, GDBUS_ARGS({ "services", "a(oa{sv})" }),
+			get_services) },
+#if defined TIZEN_EXT
+	{ GDBUS_METHOD("GetInterfaces",
+			NULL, GDBUS_ARGS({ "interface_list", "as" }),
+			get_interfaces) },
+	{ GDBUS_METHOD("GetDefaultService",
+			NULL, GDBUS_ARGS({ "service", "oa{sv}" }),
+			get_default_service) },
+	{ GDBUS_METHOD("GetConnectedService",
+			GDBUS_ARGS({ "ifname", "s" }),
+			GDBUS_ARGS({ "service", "oa{sv}" }),
+			get_connected_service) },
+#endif
+#if defined TIZEN_EXT_INS
+	{ GDBUS_METHOD("GetINS",
+			NULL, GDBUS_ARGS({ "services", "a(oa{sv})" }),
+			get_ins) },
+#endif
+	{ GDBUS_METHOD("GetPeers",
+			NULL, GDBUS_ARGS({ "peers", "a(oa{sv})" }),
+			get_peers) },
+	{ GDBUS_METHOD("GetTetheringClients",
+			NULL, GDBUS_ARGS({ "tethering_clients", "as" }),
+			get_tethering_clients) },
+	{ GDBUS_DEPRECATED_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_ASYNC_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) },
+	{ GDBUS_ASYNC_METHOD("RegisterPeerService",
+			GDBUS_ARGS({ "specification", "a{sv}" },
+				   { "master", "b" }), NULL,
+			register_peer_service) },
+	{ GDBUS_METHOD("UnregisterPeerService",
+			GDBUS_ARGS({ "specification", "a{sv}" }), NULL,
+			unregister_peer_service) },
+#if defined TIZEN_EXT_WIFI_MESH
+	{ GDBUS_METHOD("GetMeshPeers",
+			NULL, GDBUS_ARGS({ "peers", "a(oa{sv})" }),
+			get_mesh_peers) },
+	{ GDBUS_METHOD("GetConnectedMeshPeers",
+			NULL, GDBUS_ARGS({ "peers", "a(a{sv})" }),
+			get_connected_mesh_peers) },
+	{ GDBUS_METHOD("GetDisconnectedMeshPeers",
+			NULL, GDBUS_ARGS({ "peers", "a(a{sv})" }),
+			get_disconnected_mesh_peers) },
+	{ GDBUS_ASYNC_METHOD("MeshAddPeer", GDBUS_ARGS({ "address", "s" }), NULL,
+				   mesh_add_peer) },
+	{ GDBUS_ASYNC_METHOD("MeshRemovePeer", GDBUS_ARGS({ "address", "s" }), NULL,
+				   mesh_remove_peer) },
+#endif
 	{ },
 };
 
-static GDBusSignalTable manager_signals[] = {
-	{ "PropertyChanged", "sv" },
-	{ "StateChanged",    "s"  },
+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" })) },
+	{ GDBUS_SIGNAL("PeersChanged",
+			GDBUS_ARGS({ "changed", "a(oa{sv})" },
+					{ "removed", "ao" })) },
 	{ },
 };
 
@@ -671,7 +843,7 @@ int __connman_manager_init(void)
 	DBG("");
 
 	connection = connman_dbus_get_connection();
-	if (connection == NULL)
+	if (!connection)
 		return -1;
 
 	if (connman_notifier_register(&technology_notifier) < 0)
@@ -682,6 +854,8 @@ int __connman_manager_init(void)
 					manager_methods,
 					manager_signals, NULL, NULL, NULL);
 
+	connman_state_idle = true;
+
 	return 0;
 }
 
@@ -689,11 +863,11 @@ void __connman_manager_cleanup(void)
 {
 	DBG("");
 
-	connman_notifier_unregister(&technology_notifier);
-
-	if (connection == NULL)
+	if (!connection)
 		return;
 
+	connman_notifier_unregister(&technology_notifier);
+
 	g_dbus_unregister_interface(connection, CONNMAN_MANAGER_PATH,
 						CONNMAN_MANAGER_INTERFACE);