*
* Connection Manager
*
- * Copyright (C) 2007-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2012 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/dbus.h>
enum {
- NM_STATE_UNKNOWN = 0,
- NM_STATE_ASLEEP,
- NM_STATE_CONNECTING,
- NM_STATE_CONNECTED,
- NM_STATE_DISCONNECTED
+ NM_STATE_UNKNOWN = 0,
+ NM_STATE_ASLEEP = 10,
+ NM_STATE_DISCONNECTED = 20,
+ NM_STATE_DISCONNECTING = 30,
+ NM_STATE_CONNECTING = 40,
+ NM_STATE_CONNECTED_LOCAL = 50,
+ NM_STATE_CONNECTED_SITE = 60,
+ NM_STATE_CONNECTED_GLOBAL = 70
};
#define NM_SERVICE "org.freedesktop.NetworkManager"
#define DBUS_PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties"
static DBusConnection *connection = NULL;
-static dbus_uint32_t state = NM_STATE_UNKNOWN;
+static struct connman_service *current_service = NULL;
+static dbus_uint32_t nm_state = NM_STATE_UNKNOWN;
-
-static void nm_send_signal(const char *name, dbus_uint32_t state)
+static void state_changed(dbus_uint32_t state)
{
DBusMessage *signal;
- signal = dbus_message_new_signal(NM_PATH, NM_INTERFACE, name);
- if (signal == NULL)
+ DBG("state %d", state);
+
+ signal = dbus_message_new_signal(NM_PATH, NM_INTERFACE,
+ "StateChanged");
+ if (!signal)
return;
dbus_message_append_args(signal, DBUS_TYPE_UINT32, &state,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
g_dbus_send_message(connection, signal);
}
-static void nm_send_prop_signal(dbus_uint32_t state)
+static void properties_changed(dbus_uint32_t state)
{
const char *key = "State";
DBusMessageIter iter, dict, dict_entry, dict_val;
DBusMessage *signal;
+ DBG("state %d", state);
+
signal = dbus_message_new_signal(NM_PATH, NM_INTERFACE,
"PropertiesChanged");
- if (signal == NULL)
+ if (!signal)
return;
dbus_message_iter_init_append(signal, &iter);
&dict);
dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY,
- NULL, &dict_entry);
+ NULL, &dict_entry);
- dbus_message_iter_append_basic(&dict_entry, DBUS_TYPE_STRING,
- &key);
+ dbus_message_iter_append_basic(&dict_entry, DBUS_TYPE_STRING, &key);
- dbus_message_iter_open_container(&dict_entry,
- DBUS_TYPE_VARIANT,
+ dbus_message_iter_open_container(&dict_entry, DBUS_TYPE_VARIANT,
DBUS_TYPE_UINT32_AS_STRING, &dict_val);
dbus_message_iter_append_basic(&dict_val, DBUS_TYPE_UINT32, &state);
static void default_changed(struct connman_service *service)
{
- if (service != NULL)
- state = NM_STATE_CONNECTED;
- else
- state = NM_STATE_DISCONNECTED;
+ DBG("service %p", service);
- DBG("%p %d", service, state);
-
- /* older deprecated signal, in case applications still use this */
- nm_send_signal("StateChange", state);
+ if (!service)
+ nm_state = NM_STATE_DISCONNECTED;
+ else
+ nm_state = NM_STATE_CONNECTED_LOCAL;
- /* the preferred current signal */
- nm_send_signal("StateChanged", state);
+ state_changed(nm_state);
+ properties_changed(nm_state);
- nm_send_prop_signal(state);
+ current_service = service;
}
-static struct connman_notifier notifier = {
- .name = "nmcompat",
- .priority = CONNMAN_NOTIFIER_PRIORITY_DEFAULT,
- .default_changed= default_changed,
-};
-
-static DBusMessage *nm_sleep(DBusConnection *conn,
- DBusMessage *msg, void *data)
+static void service_state_changed(struct connman_service *service,
+ enum connman_service_state state)
{
- DBusMessage *reply;
+ DBG("service %p state %d", service, state);
- DBG("conn %p", conn);
-
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
+ if (!current_service || current_service != service)
+ return;
- dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+ switch (state) {
+ case CONNMAN_SERVICE_STATE_UNKNOWN:
+ nm_state = NM_STATE_UNKNOWN;
+ break;
+ case CONNMAN_SERVICE_STATE_FAILURE:
+ case CONNMAN_SERVICE_STATE_IDLE:
+ nm_state = NM_STATE_DISCONNECTED;
+ break;
+ case CONNMAN_SERVICE_STATE_ASSOCIATION:
+ case CONNMAN_SERVICE_STATE_CONFIGURATION:
+ nm_state = NM_STATE_CONNECTING;
+ break;
+ case CONNMAN_SERVICE_STATE_READY:
+ nm_state = NM_STATE_CONNECTED_LOCAL;
+ break;
+ case CONNMAN_SERVICE_STATE_ONLINE:
+ nm_state = NM_STATE_CONNECTED_GLOBAL;
+ break;
+ case CONNMAN_SERVICE_STATE_DISCONNECT:
+ nm_state = NM_STATE_DISCONNECTING;
+ break;
+ }
- return reply;
+ state_changed(nm_state);
+ properties_changed(nm_state);
}
-static DBusMessage *nm_wake(DBusConnection *conn,
- DBusMessage *msg, void *data)
+static void offline_mode(bool enabled)
{
- DBusMessage *reply;
-
- DBG("conn %p", conn);
+ DBG("enabled %d", enabled);
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
+ if (enabled)
+ nm_state = NM_STATE_ASLEEP;
+ else
+ nm_state = NM_STATE_DISCONNECTED;
- dbus_message_append_args(reply, DBUS_TYPE_INVALID);
+ state_changed(nm_state);
+ properties_changed(nm_state);
- return reply;
+ current_service = NULL;
}
-static DBusMessage *nm_state(DBusConnection *conn,
+static const struct connman_notifier notifier = {
+ .name = "nmcompat",
+ .priority = CONNMAN_NOTIFIER_PRIORITY_DEFAULT,
+ .default_changed = default_changed,
+ .service_state_changed = service_state_changed,
+ .offline_mode = offline_mode,
+};
+
+static DBusMessage *property_get(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_UINT32, &state,
- DBUS_TYPE_INVALID);
+ const char *interface, *key;
- return reply;
-}
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &interface,
+ DBUS_TYPE_STRING, &key, DBUS_TYPE_INVALID);
-static GDBusMethodTable nm_methods[] = {
- { "sleep", "", "", nm_sleep },
- { "wake", "", "", nm_wake },
- { "state", "", "u", nm_state },
- { },
-};
+ DBG("interface %s property %s", interface, key);
-static DBusMessage *nm_prop_get(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- DBusMessageIter iter, value;
- const char *interface, *key;
- DBusMessage *reply;
+ if (!g_str_equal(interface, NM_INTERFACE))
+ return dbus_message_new_error(msg, DBUS_ERROR_FAILED,
+ "Unsupported interface");
- DBG("conn %p", conn);
+ if (g_str_equal(key, "State")) {
+ DBusMessage *reply;
+ DBusMessageIter iter, value;
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
+ DBG("state %d", nm_state);
- dbus_message_get_args(msg, NULL,
- DBUS_TYPE_STRING, &interface,
- DBUS_TYPE_STRING, &key,
- DBUS_TYPE_INVALID);
+ reply = dbus_message_new_method_return(msg);
+ if (!reply)
+ return NULL;
- if (g_strcmp0(key, "State") == 0) {
dbus_message_iter_init_append(reply, &iter);
dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT,
- DBUS_TYPE_UINT32_AS_STRING,
- &value);
- dbus_message_iter_append_basic(&value, DBUS_TYPE_UINT32,
- &state);
+ DBUS_TYPE_UINT32_AS_STRING, &value);
+ dbus_message_iter_append_basic(&value,
+ DBUS_TYPE_UINT32, &nm_state);
dbus_message_iter_close_container(&iter, &value);
- } else {
- dbus_message_unref(reply);
- return dbus_message_new_error(msg, DBUS_ERROR_FAILED,
- "Unsupported property");
+
+ return reply;
}
- return reply;
+ return dbus_message_new_error(msg, DBUS_ERROR_FAILED,
+ "Unsupported property");
}
-static GDBusMethodTable nm_prop_methods[] = {
- { "Get", "ss", "v", nm_prop_get },
+static const GDBusMethodTable methods[] = {
+ { GDBUS_METHOD("Get",
+ GDBUS_ARGS({ "interface", "s" }, { "key", "s" }),
+ GDBUS_ARGS({ "property", "v" }), property_get) },
+ { },
+};
+
+static const GDBusSignalTable signals[] = {
+ { GDBUS_SIGNAL("PropertiesChanged",
+ GDBUS_ARGS({ "properties", "a{sv}" })) },
+ { GDBUS_SIGNAL("StateChanged",
+ GDBUS_ARGS({ "state", "u" })) },
{ },
};
static int nmcompat_init(void)
{
- gboolean ret;
-
DBG("");
connection = connman_dbus_get_connection();
- if (connection == NULL)
+ if (!connection)
return -1;
- if (g_dbus_request_name(connection, NM_SERVICE, NULL) == FALSE) {
- connman_error("nmcompat: can't register nm service\n");
+ if (!g_dbus_request_name(connection, NM_SERVICE, NULL)) {
+ connman_error("nmcompat: failed to register service");
return -1;
}
return -1;
}
- ret = g_dbus_register_interface(connection, NM_PATH, NM_INTERFACE,
- nm_methods, NULL, NULL, NULL, NULL);
- if (ret == FALSE) {
- connman_error("nmcompat: can't register " NM_INTERFACE);
- return -1;
- }
-
- ret = g_dbus_register_interface(connection, NM_PATH,
- DBUS_PROPERTIES_INTERFACE,
- nm_prop_methods, NULL, NULL,
- NULL, NULL);
- if (ret == FALSE) {
- connman_error("nmcompat: can't register "
- DBUS_PROPERTIES_INTERFACE);
+ if (!g_dbus_register_interface(connection, NM_PATH,
+ DBUS_PROPERTIES_INTERFACE, methods,
+ signals, NULL, NULL, NULL)) {
+ connman_error("nmcompat: failed to register "
+ DBUS_PROPERTIES_INTERFACE);
return -1;
}
connman_notifier_unregister(¬ifier);
- if (connection == NULL)
+ if (!connection)
return;
- g_dbus_unregister_interface(connection, NM_PATH, NM_INTERFACE);
+ g_dbus_unregister_interface(connection, NM_PATH,
+ DBUS_PROPERTIES_INTERFACE);
dbus_connection_unref(connection);
}
projects / platform / upstream / connman.git / blobdiff