*
* Connection Manager
*
- * Copyright (C) 2007-2008 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2009 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"
+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;
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);
dbus_message_iter_close_container(&entry, &value);
dbus_message_iter_close_container(dict, &entry);
}
-static void append_devices(DBusMessageIter *dict)
+static void append_services(DBusMessageIter *dict)
{
DBusMessageIter entry, value, iter;
- const char *key = "Devices";
+ const char *key = "Services";
dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
NULL, &entry);
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);
-
+ __connman_service_list(&iter);
dbus_message_iter_close_container(&value, &iter);
dbus_message_iter_close_container(&entry, &value);
dbus_message_iter_close_container(dict, &entry);
}
-static void append_connections(DBusMessageIter *dict)
+static void append_devices(DBusMessageIter *dict)
{
DBusMessageIter entry, value, iter;
- const char *key = "Connections";
+ const char *key = "Devices";
dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
NULL, &entry);
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);
-
+ __connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
dbus_message_iter_close_container(&value, &iter);
dbus_message_iter_close_container(&entry, &value);
dbus_message_iter_close_container(dict, &entry);
}
-static void append_state(DBusMessageIter *dict, const char *state)
+static void append_connections(DBusMessageIter *dict)
{
- DBusMessageIter entry, value;
- const char *key = "State";
+ DBusMessageIter entry, value, iter;
+ const char *key = "Connections";
dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
NULL, &entry);
dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
- DBUS_TYPE_STRING_AS_STRING, &value);
+ DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING,
+ &value);
- dbus_message_iter_append_basic(&value, DBUS_TYPE_STRING, &state);
+ 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);
dbus_message_iter_close_container(&entry, &value);
{
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);
+
reply = dbus_message_new_method_return(msg);
if (reply == NULL)
return NULL;
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+ str = __connman_profile_active_path();
+ if (str != NULL)
+ connman_dbus_dict_append_variant(&dict, "ActiveProfile",
+ DBUS_TYPE_OBJECT_PATH, &str);
+
append_profiles(&dict);
+ append_services(&dict);
append_devices(&dict);
append_connections(&dict);
if (__connman_element_count(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION) > 0)
- append_state(&dict, "online");
+ str = "online";
else
- append_state(&dict, "offline");
+ str = "offline";
+
+ 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);
dbus_message_iter_close_container(&array, &dict);
return reply;
}
-static DBusMessage *register_agent(DBusConnection *conn,
+static DBusMessage *set_property(DBusConnection *conn,
DBusMessage *msg, void *data)
{
- DBusMessage *reply;
- const char *sender, *path;
+ DBusMessageIter iter, value;
+ const char *name;
DBG("conn %p", conn);
- sender = dbus_message_get_sender(msg);
+ 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);
+
+ 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) {
+ connman_bool_t offlinemode;
+
+ dbus_message_iter_get_basic(&value, &offlinemode);
+
+ if (global_offlinemode == offlinemode)
+ return __connman_error_invalid_arguments(msg);
+
+ global_offlinemode = offlinemode;
+
+ __connman_device_set_offlinemode(offlinemode);
+ } else if (g_str_equal(name, "ActiveProfile") == TRUE) {
+ const char *str;
+
+ dbus_message_iter_get_basic(&value, &str);
+
+ return __connman_error_not_supported(msg);
+ }
+
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
+
+static DBusMessage *add_profile(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ const char *name;
+
+ DBG("conn %p", conn);
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &name,
+ DBUS_TYPE_INVALID);
+
+ return __connman_error_not_supported(msg);
+}
+
+static DBusMessage *remove_profile(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ const char *path;
+
+ DBG("conn %p", 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;
+ return __connman_error_not_supported(msg);
+}
- dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+static DBusMessage *connect_service(DBusConnection *conn,
+ DBusMessage *msg, void *data)
+{
+ DBusMessageIter iter, array;
- __connman_agent_register(sender, path);
+ DBG("conn %p", conn);
- return reply;
+ 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 *unregister_agent(DBusConnection *conn,
+static DBusMessage *register_agent(DBusConnection *conn,
DBusMessage *msg, void *data)
{
DBusMessage *reply;
dbus_message_append_args(reply, DBUS_TYPE_INVALID);
- __connman_agent_unregister(sender, path);
+ __connman_agent_register(sender, path);
return reply;
}
-#if 0
-static DBusMessage *list_elements(DBusConnection *conn,
+static DBusMessage *unregister_agent(DBusConnection *conn,
DBusMessage *msg, void *data)
{
DBusMessage *reply;
- DBusMessageIter array, iter;
+ const char *sender, *path;
DBG("conn %p", conn);
+ sender = dbus_message_get_sender(msg);
+
+ 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;
- dbus_message_iter_init_append(reply, &array);
-
- dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
- DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-
- __connman_element_list(CONNMAN_ELEMENT_TYPE_UNKNOWN, &iter);
+ dbus_message_append_args(reply, DBUS_TYPE_INVALID);
- dbus_message_iter_close_container(&array, &iter);
+ __connman_agent_unregister(sender, path);
return reply;
}
-#endif
static GDBusMethodTable manager_methods[] = {
- { "GetProperties", "", "a{sv}", get_properties },
- { "RegisterAgent", "o", "", register_agent },
- { "UnregisterAgent", "o", "", unregister_agent },
-#if 0
- { "ListElements", "", "ao", list_elements },
-#endif
+ { "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" },
-#if 0
- { "ElementAdded", "o" },
- { "ElementUpdated", "o" },
- { "ElementRemoved", "o" },
-#endif
+ { "StateChanged", "s" },
{ },
};
projects / connman / blobdiff