Add initial bits and pieces for Tethering support
[platform/upstream/connman.git] / src / manager.c
index 5fa60cc..514cd1e 100644 (file)
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2010  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
 
 #include "connman.h"
 
+static DBusMessage *get_properties(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+       DBusMessageIter array, dict;
+       connman_bool_t offlinemode, tethering;
+       const char *str;
+
+       DBG("conn %p", conn);
+
+       if (__connman_security_check_privilege(msg,
+                                       CONNMAN_SECURITY_PRIVILEGE_PUBLIC) < 0)
+               return __connman_error_permission_denied(msg);
+
+       reply = dbus_message_new_method_return(msg);
+       if (reply == NULL)
+               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, "Profiles",
+                       DBUS_TYPE_OBJECT_PATH, __connman_profile_list, NULL);
+       connman_dbus_dict_append_array(&dict, "Services",
+                       DBUS_TYPE_OBJECT_PATH, __connman_service_list, NULL);
+       connman_dbus_dict_append_array(&dict, "Providers",
+                       DBUS_TYPE_OBJECT_PATH, __connman_provider_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();
+       connman_dbus_dict_append_basic(&dict, "OfflineMode",
+                                       DBUS_TYPE_BOOLEAN, &offlinemode);
+
+       tethering = __connman_tethering_get_status();
+       connman_dbus_dict_append_basic(&dict, "Tethering",
+                                       DBUS_TYPE_BOOLEAN, &tethering);
+
+       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);
+
+       connman_dbus_dict_close(&array, &dict);
+
+       return reply;
+}
+
+static DBusMessage *set_property(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessageIter iter, value;
+       const char *name;
+       int type;
+
+       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);
+
+       type = dbus_message_iter_get_arg_type(&value);
+
+       if (g_str_equal(name, "OfflineMode") == TRUE) {
+               connman_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);
+
+               __connman_profile_save_default();
+       } else if (g_str_equal(name, "Tethering") == TRUE) {
+               connman_bool_t tethering;
+
+               if (type != DBUS_TYPE_BOOLEAN)
+                       return __connman_error_invalid_arguments(msg);
+
+               dbus_message_iter_get_basic(&value, &tethering);
+
+               if (__connman_tethering_set_status(tethering) < 0)
+                       return __connman_error_invalid_arguments(msg);
+
+               connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH,
+                                       CONNMAN_MANAGER_INTERFACE, "Tethering",
+                                               DBUS_TYPE_BOOLEAN, &tethering);
+       } else if (g_str_equal(name, "ActiveProfile") == TRUE) {
+               const char *str;
+
+               dbus_message_iter_get_basic(&value, &str);
+
+               return __connman_error_not_supported(msg);
+       } 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)
+{
+       const char *str;
+
+       DBG("conn %p", conn);
+
+       if (__connman_security_check_privilege(msg,
+                                       CONNMAN_SECURITY_PRIVILEGE_PUBLIC) < 0)
+               return __connman_error_permission_denied(msg);
+
+       str = __connman_notifier_get_state();
+
+       return g_dbus_create_reply(msg, DBUS_TYPE_STRING, &str,
+                                               DBUS_TYPE_INVALID);
+}
+
+static DBusMessage *create_profile(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       const char *name, *path;
+       int err;
+
+       DBG("conn %p", conn);
+
+       dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &name,
+                                                       DBUS_TYPE_INVALID);
+
+       if (__connman_security_check_privilege(msg,
+                                       CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
+               return __connman_error_permission_denied(msg);
+
+       err = __connman_profile_create(name, &path);
+       if (err < 0)
+               return __connman_error_failed(msg, -err);
+
+       return g_dbus_create_reply(msg, DBUS_TYPE_OBJECT_PATH, &path,
+                                                       DBUS_TYPE_INVALID);
+}
+
+static DBusMessage *remove_profile(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       const char *path;
+       int err;
+
+       DBG("conn %p", conn);
+
+       dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
+                                                       DBUS_TYPE_INVALID);
+
+       if (__connman_security_check_privilege(msg,
+                                       CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
+               return __connman_error_permission_denied(msg);
+
+       err = __connman_profile_remove(path);
+       if (err < 0)
+               return __connman_error_failed(msg, -err);
+
+       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
+
+static DBusMessage *remove_provider(DBusConnection *conn,
+                                   DBusMessage *msg, void *data)
+{
+       const char *path;
+       int err;
+
+       DBG("conn %p", conn);
+
+       dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &path,
+                             DBUS_TYPE_INVALID);
+
+       if (__connman_security_check_privilege(msg,
+                               CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
+               return __connman_error_permission_denied(msg);
+
+       err = __connman_provider_remove(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_element_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;
 
-int __connman_manager_init(DBusConnection *conn)
+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)
+{
+       DBG("");
+
+       technology_timeout = 0;
+
+       technology_reply(ETIMEDOUT);
+
+       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);
+}
+
+static struct connman_notifier technology_notifier = {
+       .name           = "manager",
+       .priority       = CONNMAN_NOTIFIER_PRIORITY_HIGH,
+       .service_enabled= technology_notify,
+};
+
+static DBusMessage *enable_technology(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) == TRUE)
+               return __connman_error_already_enabled(msg);
+
+       technology_type = type;
+       technology_enabled = TRUE;
+       technology_pending = dbus_message_ref(msg);
+
+       err = __connman_element_enable_technology(type);
+       if (err < 0 && err != -EINPROGRESS)
+               technology_reply(-err);
+       else
+               technology_timeout = g_timeout_add_seconds(15,
+                                               technology_abort, NULL);
+
+       return NULL;
+}
+
+static DBusMessage *disable_technology(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
 {
+       enum connman_service_type type;
+       const char *str;
+       int err;
+
        DBG("conn %p", conn);
 
-       connection = dbus_connection_ref(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);
+
+       technology_type = type;
+       technology_enabled = FALSE;
+       technology_pending = dbus_message_ref(msg);
+
+       err = __connman_element_disable_technology(type);
+       if (err < 0 && err != -EINPROGRESS)
+               technology_reply(-err);
+       else
+               technology_timeout = g_timeout_add_seconds(10,
+                                               technology_abort, NULL);
+
+       return NULL;
+}
+
+static DBusMessage *get_services(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+       DBusMessageIter iter, array;
+
+       reply = dbus_message_new_method_return(msg);
+       if (reply == NULL)
+               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);
+
+       __connman_service_list_struct(&array);
+
+       dbus_message_iter_close_container(&iter, &array);
+
+       return reply;
+}
+
+static DBusMessage *lookup_service(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       const char *pattern, *path;
+       int err;
+
+       DBG("conn %p", conn);
+
+       dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &pattern,
+                                                       DBUS_TYPE_INVALID);
+
+       err = __connman_service_lookup(pattern, &path);
+       if (err < 0)
+               return __connman_error_failed(msg, -err);
+
+       return g_dbus_create_reply(msg, DBUS_TYPE_OBJECT_PATH, &path,
+                                                       DBUS_TYPE_INVALID);
+}
+
+static DBusMessage *connect_service(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       int err;
+
+       DBG("conn %p", conn);
+
+       if (__connman_security_check_privilege(msg,
+                                       CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
+               return __connman_error_permission_denied(msg);
+
+       err = __connman_service_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 NULL;
+}
+
+
+static DBusMessage *connect_provider(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       int err;
+
+       DBG("conn %p", conn);
+
+       if (__connman_security_check_privilege(msg,
+                               CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
+               return __connman_error_permission_denied(msg);
+
+       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 NULL;
+}
+
+static DBusMessage *register_agent(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       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);
+
+       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 *unregister_agent(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       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);
+
+       err = __connman_agent_unregister(sender, path);
+       if (err < 0)
+               return __connman_error_failed(msg, -err);
+
+       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
+
+static DBusMessage *register_counter(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       const char *sender, *path;
+       unsigned int interval;
+       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, &interval,
+                                                       DBUS_TYPE_INVALID);
+
+       err = __connman_counter_register(sender, path, interval);
+       if (err < 0)
+               return __connman_error_failed(msg, -err);
+
+       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
+
+static DBusMessage *unregister_counter(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       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);
+
+       err = __connman_counter_unregister(sender, path);
+       if (err < 0)
+               return __connman_error_failed(msg, -err);
+
+       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
+
+static DBusMessage *request_session(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       const char *bearer, *sender, *service_path;
+       struct connman_service *service;
+
+       DBG("conn %p", conn);
+
+       sender = dbus_message_get_sender(msg);
+
+       dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &bearer,
+                                                       DBUS_TYPE_INVALID);
+
+       service = __connman_session_request(bearer, sender);
+       if (service == NULL)
+               return __connman_error_failed(msg, EINVAL);
+
+       service_path = __connman_service_get_path(service);
+
+       return g_dbus_create_reply(msg, DBUS_TYPE_OBJECT_PATH, &service_path,
+                                               DBUS_TYPE_INVALID);
+}
+
+static DBusMessage *release_session(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       const char *sender;
+       int err;
+
+       DBG("conn %p", conn);
+
+       sender = dbus_message_get_sender(msg);
+
+       err = __connman_session_release(sender);
+       if (err < 0)
+               return __connman_error_failed(msg, -err);
+
+       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          },
+       { "CreateProfile",     "s",     "o",     create_profile     },
+       { "RemoveProfile",     "o",     "",      remove_profile     },
+       { "RemoveProvider",    "s",     "",      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 },
+       { "ConnectProvider",   "a{sv}", "o",     connect_provider,
+                                               G_DBUS_METHOD_FLAG_ASYNC },
+       { "RegisterAgent",     "o",     "",      register_agent     },
+       { "UnregisterAgent",   "o",     "",      unregister_agent   },
+       { "RegisterCounter",   "ou",    "",      register_counter   },
+       { "UnregisterCounter", "o",     "",      unregister_counter },
+       { "RequestSession",    "s",     "o",     request_session    },
+       { "ReleaseSession",    "s",     "",      release_session    },
+       { },
+};
+
+static GDBusSignalTable manager_signals[] = {
+       { "PropertyChanged", "sv" },
+       { "StateChanged",    "s"  },
+       { },
+};
+
+static DBusMessage *nm_sleep(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+
+       DBG("conn %p", conn);
+
+       reply = dbus_message_new_method_return(msg);
+       if (reply == NULL)
+               return NULL;
+
+       dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+
+       return reply;
+}
+
+static DBusMessage *nm_wake(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+
+       DBG("conn %p", conn);
+
+       reply = dbus_message_new_method_return(msg);
+       if (reply == NULL)
+               return NULL;
+
+       dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+
+       return reply;
+}
+
+enum {
+       NM_STATE_UNKNOWN = 0,
+       NM_STATE_ASLEEP,
+       NM_STATE_CONNECTING,
+       NM_STATE_CONNECTED,
+       NM_STATE_DISCONNECTED
+};
+
+static DBusMessage *nm_state(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessage *reply;
+       dbus_uint32_t state;
+
+       DBG("conn %p", conn);
+
+       reply = dbus_message_new_method_return(msg);
+       if (reply == NULL)
+               return NULL;
+
+       if (__connman_notifier_count_connected() > 0)
+               state = NM_STATE_CONNECTED;
+       else
+               state = NM_STATE_DISCONNECTED;
+
+       dbus_message_append_args(reply, DBUS_TYPE_UINT32, &state,
+                                                       DBUS_TYPE_INVALID);
+
+       return reply;
+}
+
+static GDBusMethodTable nm_methods[] = {
+       { "sleep", "",  "",   nm_sleep        },
+       { "wake",  "",  "",   nm_wake         },
+       { "state", "",  "u",  nm_state        },
+       { },
+};
+
+static gboolean nm_compat = FALSE;
+
+int __connman_manager_init(gboolean compat)
+{
+       DBG("");
+
+       connection = connman_dbus_get_connection();
        if (connection == NULL)
                return -1;
 
-       g_dbus_register_object(connection, CONNMAN_MANAGER_PATH, NULL, NULL);
+       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;
+       }
 
        return 0;
 }
 
 void __connman_manager_cleanup(void)
 {
-       DBG("conn %p", connection);
+       DBG("");
+
+       connman_notifier_unregister(&technology_notifier);
+
+       if (connection == NULL)
+               return;
+
+       if (nm_compat == TRUE) {
+               g_dbus_unregister_interface(connection, NM_PATH, NM_INTERFACE);
+       }
 
-       g_dbus_unregister_object(connection, CONNMAN_MANAGER_PATH);
+       g_dbus_unregister_interface(connection, CONNMAN_MANAGER_PATH,
+                                               CONNMAN_MANAGER_INTERFACE);
 
        dbus_connection_unref(connection);
 }