*
* 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
NM_STATE_CONNECTED_GLOBAL = 70
};
-#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
-
#define NM_SERVICE "org.freedesktop.NetworkManager"
#define NM_PATH "/org/freedesktop/NetworkManager"
#define NM_INTERFACE NM_SERVICE
#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 state_changed(dbus_uint32_t state)
{
DBusMessage *signal;
+ DBG("state %d", state);
+
signal = dbus_message_new_signal(NM_PATH, NM_INTERFACE,
"StateChanged");
- if (signal == NULL)
+ if (!signal)
return;
dbus_message_append_args(signal, DBUS_TYPE_UINT32, &state,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
g_dbus_send_message(connection, signal);
}
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);
static void default_changed(struct connman_service *service)
{
- if (service != NULL)
- state = NM_STATE_CONNECTED;
+ DBG("service %p", service);
+
+ if (!service)
+ nm_state = NM_STATE_DISCONNECTED;
else
- state = NM_STATE_DISCONNECTED;
+ nm_state = NM_STATE_CONNECTED_LOCAL;
+
+ state_changed(nm_state);
+ properties_changed(nm_state);
- DBG("%p %d", service, state);
+ current_service = service;
+}
- state_changed(state);
+static void service_state_changed(struct connman_service *service,
+ enum connman_service_state state)
+{
+ DBG("service %p state %d", service, state);
+
+ if (!current_service || current_service != service)
+ return;
+
+ 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;
+ }
- properties_changed(state);
+ state_changed(nm_state);
+ properties_changed(nm_state);
+}
+
+static void offline_mode(bool enabled)
+{
+ DBG("enabled %d", enabled);
+
+ if (enabled)
+ nm_state = NM_STATE_ASLEEP;
+ else
+ nm_state = NM_STATE_DISCONNECTED;
+
+ state_changed(nm_state);
+ properties_changed(nm_state);
+
+ current_service = NULL;
}
static struct connman_notifier notifier = {
- .name = "nmcompat",
- .priority = CONNMAN_NOTIFIER_PRIORITY_DEFAULT,
- .default_changed= default_changed,
+ .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,
{
const char *interface, *key;
- DBG("conn %p", conn);
-
- dbus_message_get_args(msg, NULL,
- DBUS_TYPE_STRING, &interface,
- DBUS_TYPE_STRING, &key,
- DBUS_TYPE_INVALID);
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &interface,
+ DBUS_TYPE_STRING, &key, DBUS_TYPE_INVALID);
DBG("interface %s property %s", interface, key);
- if (g_strcmp0(key, "State") == 0) {
+ if (!g_str_equal(interface, NM_INTERFACE))
+ return dbus_message_new_error(msg, DBUS_ERROR_FAILED,
+ "Unsupported interface");
+
+ if (g_str_equal(key, "State")) {
DBusMessage *reply;
DBusMessageIter iter, value;
+ DBG("state %d", nm_state);
+
reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
+ if (!reply)
return NULL;
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);
return reply;
"Unsupported property");
}
-static GDBusMethodTable methods[] = {
- { "Get", "ss", "v", property_get },
+static const GDBusMethodTable methods[] = {
+ { GDBUS_METHOD("Get",
+ GDBUS_ARGS({ "interface", "s" }, { "key", "s" }),
+ GDBUS_ARGS({ "property", "v" }), property_get) },
{ },
};
-static GDBusSignalTable signals[] = {
- { "PropertiesChanged", "a{sv}" },
- { "StateChanged", "u" },
+static const GDBusSignalTable signals[] = {
+ { GDBUS_SIGNAL("PropertiesChanged",
+ GDBUS_ARGS({ "properties", "a{sv}" })) },
+ { GDBUS_SIGNAL("StateChanged",
+ GDBUS_ARGS({ "state", "u" })) },
{ },
};
DBG("");
connection = connman_dbus_get_connection();
- if (connection == NULL)
+ if (!connection)
return -1;
- if (g_dbus_request_name(connection, NM_SERVICE, NULL) == FALSE) {
+ if (!g_dbus_request_name(connection, NM_SERVICE, NULL)) {
connman_error("nmcompat: failed to register service");
return -1;
}
return -1;
}
- if (g_dbus_register_interface(connection, NM_PATH,
- DBUS_PROPERTIES_INTERFACE,
- methods, signals, NULL, NULL, NULL) == FALSE) {
+ 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,
projects / platform / upstream / connman.git / blobdiff