The global policy also makes no sense and so remove that, too

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

diff --git a/src/manager.c b/src/manager.c
index 4814f53..a6c6021 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -27,44 +27,8 @@
 
 #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 const char *policy2string(enum connman_policy policy)
-{
-       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";
-       }
-
-       return NULL;
-}
-
-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;
-}
-
 static void append_profiles(DBusMessageIter *dict)
 {
        DBusMessageIter entry, value, iter;
@@ -105,7 +69,7 @@ static void append_services(DBusMessageIter *dict)
 
        dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
                                DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-       __connman_profile_list_services(&iter);
+       __connman_service_list(&iter);
        dbus_message_iter_close_container(&value, &iter);
 
        dbus_message_iter_close_container(&entry, &value);
@@ -185,7 +149,7 @@ static DBusMessage *get_properties(DBusConnection *conn,
                        DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
                        DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
 
-       str = __connman_profile_active();
+       str = __connman_profile_active_path();
        if (str != NULL)
                connman_dbus_dict_append_variant(&dict, "ActiveProfile",
                                                DBUS_TYPE_OBJECT_PATH, &str);
@@ -204,11 +168,6 @@ static DBusMessage *get_properties(DBusConnection *conn,
        connman_dbus_dict_append_variant(&dict, "State",
                                                DBUS_TYPE_STRING, &str);
 
-       str = policy2string(global_policy);
-       if (str != NULL)
-               connman_dbus_dict_append_variant(&dict, "Policy",
-                                               DBUS_TYPE_STRING, &str);
-
        connman_dbus_dict_append_variant(&dict, "OfflineMode",
                                DBUS_TYPE_BOOLEAN, &global_offlinemode);
 
@@ -236,17 +195,7 @@ static DBusMessage *set_property(DBusConnection *conn,
                                        CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
                return __connman_error_permission_denied(msg);
 
-       if (g_str_equal(name, "Policy") == TRUE) {
-               enum connman_policy policy;
-               const char *str;
-
-               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) {
+       if (g_str_equal(name, "OfflineMode") == TRUE) {
                connman_bool_t offlinemode;
 
                dbus_message_iter_get_basic(&value, &offlinemode);
@@ -263,7 +212,8 @@ static DBusMessage *set_property(DBusConnection *conn,
                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);
 }
@@ -294,6 +244,39 @@ static DBusMessage *remove_profile(DBusConnection *conn,
        return __connman_error_not_supported(msg);
 }
 
+static DBusMessage *connect_service(DBusConnection *conn,
+                                       DBusMessage *msg, void *data)
+{
+       DBusMessageIter iter, array;
+
+       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);
+
+               switch (dbus_message_iter_get_arg_type(&value)) {
+               }
+
+               dbus_message_iter_next(&array);
+       }
+
+       return __connman_error_not_implemented(msg);
+}
+
 static DBusMessage *register_agent(DBusConnection *conn,
                                        DBusMessage *msg, void *data)
 {
@@ -343,17 +326,19 @@ static DBusMessage *unregister_agent(DBusConnection *conn,
 }
 
 static GDBusMethodTable manager_methods[] = {
-       { "GetProperties",   "",   "a{sv}", get_properties   },
-       { "SetProperty",     "sv", "",      set_property     },
-       { "AddProfile",      "s",  "o",     add_profile      },
-       { "RemoveProfile",   "o",  "",      remove_profile   },
-       { "RegisterAgent",   "o",  "",      register_agent   },
-       { "UnregisterAgent", "o",  "",      unregister_agent },
+       { "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 },
        { },
 };
 
 static GDBusSignalTable manager_signals[] = {
        { "PropertyChanged", "sv" },
+       { "StateChanged",    "s"  },
        { },
 };