char *profile;
struct connman_device *device;
struct connman_network *network;
+ DBusMessage *pending;
+ guint timeout;
};
static void append_path(gpointer value, gpointer user_data)
}
static DBusMessage *get_properties(DBusConnection *conn,
- DBusMessage *msg, void *data)
+ DBusMessage *msg, void *user_data)
{
- struct connman_service *service = data;
+ struct connman_service *service = user_data;
DBusMessage *reply;
DBusMessageIter array, dict;
const char *str;
- DBG("conn %p", conn);
+ DBG("service %p", service);
reply = dbus_message_new_method_return(msg);
if (reply == NULL)
}
static DBusMessage *set_property(DBusConnection *conn,
- DBusMessage *msg, void *data)
+ DBusMessage *msg, void *user_data)
{
- struct connman_service *service = data;
+ struct connman_service *service = user_data;
DBusMessageIter iter, value;
const char *name;
int type;
- DBG("conn %p", conn);
+ DBG("service %p", service);
if (dbus_message_iter_init(msg, &iter) == FALSE)
return __connman_error_invalid_arguments(msg);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
+static gboolean connect_timeout(gpointer user_data)
+{
+ struct connman_service *service = user_data;
+
+ DBG("service %p", service);
+
+ service->timeout = 0;
+
+ if (service->network != NULL)
+ __connman_network_disconnect(service->network);
+
+ if (service->pending != NULL) {
+ DBusMessage *reply;
+
+ reply = __connman_error_operation_timeout(service->pending);
+ if (reply != NULL)
+ g_dbus_send_message(connection, reply);
+
+ dbus_message_unref(service->pending);
+ service->pending = NULL;
+
+ __connman_service_indicate_state(service,
+ CONNMAN_SERVICE_STATE_FAILURE);
+ }
+
+ return FALSE;
+}
+
static DBusMessage *connect_service(DBusConnection *conn,
- DBusMessage *msg, void *data)
+ DBusMessage *msg, void *user_data)
{
- struct connman_service *service = data;
+ struct connman_service *service = user_data;
+
+ DBG("service %p", service);
+
+ if (service->pending != NULL)
+ return __connman_error_in_progress(msg);
+
+ if (service->state == CONNMAN_SERVICE_STATE_READY)
+ return __connman_error_already_connected(msg);
if (service->network != NULL) {
int err;
if (err < 0 && err != -EINPROGRESS)
return __connman_error_failed(msg, -err);
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ service->pending = dbus_message_ref(msg);
+
+ service->timeout = g_timeout_add_seconds(45,
+ connect_timeout, service);
+
+ return NULL;
} else if (service->device != NULL) {
if (service->favorite == FALSE)
return __connman_error_no_carrier(msg);
if (__connman_device_connect(service->device) < 0)
return __connman_error_failed(msg, EINVAL);
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ service->pending = dbus_message_ref(msg);
+ service->timeout = g_timeout_add_seconds(15,
+ connect_timeout, service);
+
+ return NULL;
}
return __connman_error_not_supported(msg);
}
static DBusMessage *disconnect_service(DBusConnection *conn,
- DBusMessage *msg, void *data)
+ DBusMessage *msg, void *user_data)
{
- struct connman_service *service = data;
+ struct connman_service *service = user_data;
+
+ DBG("service %p", service);
+
+ if (service->pending != NULL) {
+ DBusMessage *reply;
+
+ reply = __connman_error_operation_aborted(service->pending);
+ if (reply != NULL)
+ g_dbus_send_message(conn, reply);
+
+ dbus_message_unref(service->pending);
+ service->pending = NULL;
+
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ }
if (service->network != NULL) {
+ struct connman_device *device;
int err;
+ device = connman_network_get_device(service->network);
+ if (device != NULL)
+ __connman_device_disconnect(device);
+
err = __connman_network_disconnect(service->network);
if (err < 0 && err != -EINPROGRESS)
return __connman_error_failed(msg, -err);
}
static DBusMessage *remove_service(DBusConnection *conn,
- DBusMessage *msg, void *data)
+ DBusMessage *msg, void *user_data)
{
- struct connman_service *service = data;
+ struct connman_service *service = user_data;
+
+ DBG("service %p", service);
if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET)
return __connman_error_not_supported(msg);
if (service->network != NULL) {
+ struct connman_device *device;
int err;
+ device = connman_network_get_device(service->network);
+ if (device != NULL)
+ __connman_device_disconnect(device);
+
err = __connman_network_disconnect(service->network);
if (err < 0 && err != -EINPROGRESS)
return __connman_error_failed(msg, -err);
}
connman_service_set_favorite(service, FALSE);
-
__connman_storage_save_service(service);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
static DBusMessage *move_before(DBusConnection *conn,
- DBusMessage *msg, void *data)
+ DBusMessage *msg, void *user_data)
{
- struct connman_service *service = data;
+ struct connman_service *service = user_data;
+
+ DBG("service %p", service);
if (service->favorite == FALSE)
return __connman_error_not_supported(msg);
}
static DBusMessage *move_after(DBusConnection *conn,
- DBusMessage *msg, void *data)
+ DBusMessage *msg, void *user_data)
{
- struct connman_service *service = data;
+ struct connman_service *service = user_data;
+
+ DBG("service %p", service);
if (service->favorite == FALSE)
return __connman_error_not_supported(msg);
static GDBusMethodTable service_methods[] = {
{ "GetProperties", "", "a{sv}", get_properties },
{ "SetProperty", "sv", "", set_property },
- { "Connect", "", "", connect_service },
+ { "Connect", "", "", connect_service,
+ G_DBUS_METHOD_FLAG_ASYNC },
{ "Disconnect", "", "", disconnect_service },
{ "Remove", "", "", remove_service },
{ "MoveBefore", "o", "", move_before },
{ },
};
-static void service_free(gpointer data)
+static void service_free(gpointer user_data)
{
- struct connman_service *service = data;
+ struct connman_service *service = user_data;
char *path = service->path;
DBG("service %p", service);
g_hash_table_remove(service_hash, service->identifier);
+ if (service->timeout > 0)
+ g_source_remove(service->timeout);
+
+ if (service->pending != NULL) {
+ dbus_message_unref(service->pending);
+ service->pending = NULL;
+ }
+
service->path = NULL;
if (path != NULL) {
}
/**
- * connman_service_put:
+ * __connman_service_put:
* @service: service structure
*
* Release service if no longer needed
*/
-void connman_service_put(struct connman_service *service)
+void __connman_service_put(struct connman_service *service)
{
DBG("service %p", service);
*/
void connman_service_unref(struct connman_service *service)
{
- connman_service_put(service);
+ __connman_service_put(service);
}
static gint service_compare(gconstpointer a, gconstpointer b,
struct connman_service *service_a = (void *) a;
struct connman_service *service_b = (void *) b;
+ if (service_a->state != service_b->state) {
+ if (service_a->state == CONNMAN_SERVICE_STATE_READY)
+ return -1;
+ if (service_b->state == CONNMAN_SERVICE_STATE_READY)
+ return 1;
+ }
+
if (service_a->order > service_b->order)
return -1;
if (iter == NULL)
return -ENOENT;
- if (service->favorite)
+ if (service->favorite == favorite)
return -EALREADY;
service->favorite = favorite;
int __connman_service_indicate_state(struct connman_service *service,
enum connman_service_state state)
{
+ GSequenceIter *iter;
+
DBG("service %p state %d", service, state);
if (service == NULL)
service->state = state;
state_changed(service);
- if (state == CONNMAN_SERVICE_STATE_READY)
- return connman_service_set_favorite(service, TRUE);
+ if (state == CONNMAN_SERVICE_STATE_READY) {
+ connman_service_set_favorite(service, TRUE);
+ __connman_storage_save_service(service);
+
+ if (service->timeout > 0)
+ g_source_remove(service->timeout);
+
+ if (service->pending != NULL) {
+ g_dbus_send_reply(connection, service->pending,
+ DBUS_TYPE_INVALID);
+
+ dbus_message_unref(service->pending);
+ service->pending = NULL;
+ }
+ }
+
+ if (state == CONNMAN_SERVICE_STATE_FAILURE) {
+ if (service->timeout > 0)
+ g_source_remove(service->timeout);
+
+ if (service->pending != NULL) {
+ DBusMessage *reply;
+
+ reply = __connman_error_failed(service->pending, EIO);
+ if (reply != NULL)
+ g_dbus_send_message(connection, reply);
+
+ dbus_message_unref(service->pending);
+ service->pending = NULL;
+ }
+
+ service->state = CONNMAN_SERVICE_STATE_IDLE;
+ state_changed(service);
+ }
+
+ iter = g_hash_table_lookup(service_hash, service->identifier);
+ if (iter != NULL)
+ g_sequence_sort_changed(iter, service_compare, NULL);
+
+ __connman_profile_changed();
return 0;
}
/**
- * connman_service_lookup:
+ * __connman_service_lookup:
* @identifier: service identifier
*
* Look up a service by identifier (reference count will not be increased)
*/
-struct connman_service *connman_service_lookup(const char *identifier)
+static struct connman_service *__connman_service_lookup(const char *identifier)
{
GSequenceIter *iter;
}
/**
- * connman_service_get:
+ * __connman_service_get:
* @identifier: service identifier
*
* Look up a service by identifier or create a new one if not found
*/
-struct connman_service *connman_service_get(const char *identifier)
+static struct connman_service *__connman_service_get(const char *identifier)
{
struct connman_service *service;
GSequenceIter *iter;
static int service_register(struct connman_service *service)
{
const char *path = __connman_profile_active_path();
+ GSequenceIter *iter;
DBG("service %p", service);
service_methods, service_signals,
NULL, service, NULL);
+ __connman_storage_load_service(service);
+
+ iter = g_hash_table_lookup(service_hash, service->identifier);
+ if (iter != NULL)
+ g_sequence_sort_changed(iter, service_compare, NULL);
+
__connman_profile_changed();
return 0;
name = g_strdup_printf("%s_%s",
__connman_device_get_type(device), ident);
- service = connman_service_lookup(name);
+ service = __connman_service_lookup(name);
g_free(name);
name = g_strdup_printf("%s_%s",
__connman_device_get_type(device), ident);
- service = connman_service_get(name);
+ service = __connman_service_get(name);
if (service == NULL)
goto done;
if (service->path != NULL) {
- connman_service_put(service);
+ __connman_service_put(service);
service = NULL;
goto done;
}
name = g_strdup_printf("%s_%s_%s",
__connman_network_get_type(network), ident, group);
- service = connman_service_lookup(name);
+ service = __connman_service_lookup(name);
g_free(name);
name = g_strdup_printf("%s_%s_%s",
__connman_network_get_type(network), ident, group);
- service = connman_service_get(name);
+ service = __connman_service_get(name);
if (service == NULL)
goto done;
__connman_profile_changed();
- connman_service_put(service);
+ __connman_service_put(service);
service = NULL;
goto done;
}
service->type = convert_network_type(network);
+ service->state = CONNMAN_SERVICE_STATE_IDLE;
+
update_from_network(service, network);
service_register(service);
g_free(data);
+ switch (service->type) {
+ case CONNMAN_SERVICE_TYPE_UNKNOWN:
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ break;
+ case CONNMAN_SERVICE_TYPE_WIFI:
+ case CONNMAN_SERVICE_TYPE_WIMAX:
+ service->favorite = g_key_file_get_boolean(keyfile,
+ service->identifier, "Favorite", NULL);
+ break;
+ }
+
str = g_key_file_get_string(keyfile,
service->identifier, "Passphrase", NULL);
if (str != NULL) {
g_free(data);
update:
+ if (service->name != NULL)
+ g_key_file_set_string(keyfile, service->identifier,
+ "Name", service->name);
+
+ switch (service->type) {
+ case CONNMAN_SERVICE_TYPE_UNKNOWN:
+ case CONNMAN_SERVICE_TYPE_ETHERNET:
+ break;
+ case CONNMAN_SERVICE_TYPE_WIFI:
+ case CONNMAN_SERVICE_TYPE_WIMAX:
+ g_key_file_set_boolean(keyfile, service->identifier,
+ "Favorite", service->favorite);
+ break;
+ }
+
if (service->passphrase != NULL)
g_key_file_set_string(keyfile, service->identifier,
"Passphrase", service->passphrase);
projects / connman / blobdiff