Add initial bits and pieces for Tethering support

[platform/upstream/connman.git] / src / manager.c

diff --git a/src/manager.c b/src/manager.c
index b806ba2..514cd1e 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -32,7 +32,7 @@ static DBusMessage *get_properties(DBusConnection *conn,
 {
        DBusMessage *reply;
        DBusMessageIter array, dict;
-       connman_bool_t offlinemode;
+       connman_bool_t offlinemode, tethering;
        const char *str;
 
        DBG("conn %p", conn);
@@ -71,6 +71,10 @@ static DBusMessage *get_properties(DBusConnection *conn,
        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",
@@ -126,6 +130,20 @@ static DBusMessage *set_property(DBusConnection *conn,
                __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;
 
@@ -413,6 +431,35 @@ static DBusMessage *disable_technology(DBusConnection *conn,
        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)
 {
@@ -428,7 +475,7 @@ static DBusMessage *lookup_service(DBusConnection *conn,
        if (err < 0)
                return __connman_error_failed(msg, -err);
 
-       return g_dbus_create_reply(msg, DBUS_TYPE_STRING, &path,
+       return g_dbus_create_reply(msg, DBUS_TYPE_OBJECT_PATH, &path,
                                                        DBUS_TYPE_INVALID);
 }
 
@@ -458,7 +505,7 @@ static DBusMessage *connect_service(DBusConnection *conn,
 
 
 static DBusMessage *connect_provider(DBusConnection *conn,
-                                    DBusMessage *msg, void *data)
+                                       DBusMessage *msg, void *data)
 {
        int err;
 
@@ -615,6 +662,7 @@ static GDBusMethodTable manager_methods[] = {
                                                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 },