#include <config.h>
#endif
+#include <stdio.h>
+#include <string.h>
#include <gdbus.h>
#include "connman.h"
connman_uint8_t strength;
connman_bool_t favorite;
connman_bool_t hidden;
+ connman_bool_t ignore;
GTimeVal modified;
unsigned int order;
char *name;
return NULL;
}
+static const char *error2string(enum connman_service_error error)
+{
+ switch (error) {
+ case CONNMAN_SERVICE_ERROR_UNKNOWN:
+ break;
+ case CONNMAN_SERVICE_ERROR_PIN_MISSING:
+ return "pin-missing";
+ case CONNMAN_SERVICE_ERROR_DHCP_FAILED:
+ return "dhcp-failed";
+ case CONNMAN_SERVICE_ERROR_CONNECT_FAILED:
+ return "connect-failed";
+ }
+
+ return NULL;
+}
+
+static enum connman_service_error string2error(const char *error)
+{
+ if (g_strcmp0(error, "dhcp-failed") == 0)
+ return CONNMAN_SERVICE_ERROR_DHCP_FAILED;
+ else if (g_strcmp0(error, "pin-missing") == 0)
+ return CONNMAN_SERVICE_ERROR_PIN_MISSING;
+
+ return CONNMAN_SERVICE_ERROR_UNKNOWN;
+}
+
static void state_changed(struct connman_service *service)
{
DBusMessage *signal;
connman_dbus_dict_append_variant(&dict, "State",
DBUS_TYPE_STRING, &str);
+ str = error2string(service->error);
+ if (str != NULL)
+ connman_dbus_dict_append_variant(&dict, "Error",
+ DBUS_TYPE_STRING, &str);
+
if (service->strength > 0)
connman_dbus_dict_append_variant(&dict, "Strength",
DBUS_TYPE_BYTE, &service->strength);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
+static DBusMessage *clear_property(DBusConnection *conn,
+ DBusMessage *msg, void *user_data)
+{
+ struct connman_service *service = user_data;
+ const char *name;
+
+ DBG("service %p", service);
+
+ dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &name,
+ DBUS_TYPE_INVALID);
+
+ if (__connman_security_check_privilege(msg,
+ CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0)
+ return __connman_error_permission_denied(msg);
+
+ if (g_str_equal(name, "Error") == TRUE) {
+ service->state = CONNMAN_SERVICE_STATE_IDLE;
+ service->error = CONNMAN_SERVICE_ERROR_UNKNOWN;
+ state_changed(service);
+
+ g_get_current_time(&service->modified);
+ __connman_storage_save_service(service);
+ } else
+ return __connman_error_invalid_property(msg);
+
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
+
+static connman_bool_t is_connecting(struct connman_service *service)
+{
+ switch (service->state) {
+ case CONNMAN_SERVICE_STATE_UNKNOWN:
+ case CONNMAN_SERVICE_STATE_IDLE:
+ case CONNMAN_SERVICE_STATE_CARRIER:
+ case CONNMAN_SERVICE_STATE_FAILURE:
+ case CONNMAN_SERVICE_STATE_DISCONNECT:
+ case CONNMAN_SERVICE_STATE_READY:
+ break;
+ case CONNMAN_SERVICE_STATE_ASSOCIATION:
+ case CONNMAN_SERVICE_STATE_CONFIGURATION:
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static struct connman_service *find_pending_service(void)
+{
+ struct connman_service *service;
+ GSequenceIter *iter;
+
+ iter = g_sequence_get_begin_iter(service_list);
+
+ while (g_sequence_iter_is_end(iter) == FALSE) {
+ service = g_sequence_get(iter);
+ if (service->pending != NULL)
+ return service;
+
+ iter = g_sequence_iter_next(iter);
+ }
+
+ return NULL;
+}
+
+static connman_bool_t is_ignore(struct connman_service *service)
+{
+ if (service->ignore == TRUE)
+ return TRUE;
+
+ if (service->state == CONNMAN_SERVICE_STATE_FAILURE)
+ return TRUE;
+
+ return FALSE;
+}
+
+static void __connman_service_auto_connect(void)
+{
+ struct connman_service *service;
+ GSequenceIter *iter;
+
+ DBG("");
+
+ service = find_pending_service();
+ if (service != NULL)
+ return;
+
+ iter = g_sequence_get_begin_iter(service_list);
+ if (g_sequence_iter_is_end(iter) == TRUE)
+ return;
+
+ service = g_sequence_get(iter);
+
+ while (is_ignore(service) == TRUE) {
+ iter = g_sequence_iter_next(iter);
+ if (g_sequence_iter_is_end(iter))
+ return;
+ service = g_sequence_get(iter);
+ }
+
+ if (service->favorite == FALSE)
+ return;
+
+ if (service->state == CONNMAN_SERVICE_STATE_READY)
+ return;
+
+ if (is_connecting(service) == TRUE)
+ return;
+
+ if (service->state == CONNMAN_SERVICE_STATE_IDLE)
+ __connman_service_connect(service);
+}
+
static gboolean connect_timeout(gpointer user_data)
{
struct connman_service *service = user_data;
+ connman_bool_t auto_connect = FALSE;
DBG("service %p", service);
service->timeout = 0;
- if (service->network != NULL)
+ if (service->network != NULL) {
+ connman_bool_t connected;
+
+ connected = connman_network_get_connected(service->network);
+ if (connected == TRUE) {
+ __connman_service_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY);
+ return FALSE;
+ }
+
__connman_network_disconnect(service->network);
+ } else if (service->device != NULL) {
+ connman_bool_t disconnected;
+
+ disconnected = connman_device_get_disconnected(service->device);
+ if (disconnected == FALSE) {
+ __connman_service_indicate_state(service,
+ CONNMAN_SERVICE_STATE_READY);
+ return FALSE;
+ }
+
+ __connman_device_disconnect(service->device);
+ }
if (service->pending != NULL) {
DBusMessage *reply;
dbus_message_unref(service->pending);
service->pending = NULL;
+ } else
+ auto_connect = TRUE;
- __connman_service_indicate_state(service,
+ __connman_service_indicate_state(service,
CONNMAN_SERVICE_STATE_FAILURE);
- }
+
+ if (auto_connect == TRUE)
+ __connman_service_auto_connect();
return FALSE;
}
DBusMessage *msg, void *user_data)
{
struct connman_service *service = user_data;
+ int err;
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;
+ service->ignore = FALSE;
- if (service->hidden == TRUE)
- return __connman_error_invalid_service(msg);
+ service->pending = dbus_message_ref(msg);
- connman_network_set_string(service->network,
- "WiFi.Passphrase", service->passphrase);
+ err = __connman_service_connect(service);
+ if (err < 0) {
+ if (err != -EINPROGRESS) {
+ dbus_message_unref(service->pending);
+ service->pending = NULL;
- err = __connman_network_connect(service->network);
- if (err < 0 && err != -EINPROGRESS)
return __connman_error_failed(msg, -err);
-
- 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);
-
- service->pending = dbus_message_ref(msg);
- service->timeout = g_timeout_add_seconds(15,
- connect_timeout, service);
+ }
return NULL;
}
- return __connman_error_not_supported(msg);
+ dbus_message_unref(service->pending);
+ service->pending = NULL;
+
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
static DBusMessage *disconnect_service(DBusConnection *conn,
DBusMessage *msg, void *user_data)
{
struct connman_service *service = user_data;
+ int err;
DBG("service %p", service);
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
- if (service->network != NULL) {
- int err;
-
- err = __connman_network_disconnect(service->network);
- if (err < 0 && err != -EINPROGRESS)
- return __connman_error_failed(msg, -err);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
- } else if (service->device != NULL) {
- int err;
-
- if (service->favorite == FALSE)
- return __connman_error_no_carrier(msg);
+ service->ignore = TRUE;
- err = __connman_device_disconnect(service->device);
- if (err < 0)
+ err = __connman_service_disconnect(service);
+ if (err < 0) {
+ if (err != -EINPROGRESS)
return __connman_error_failed(msg, -err);
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+ return NULL;
}
- return __connman_error_not_supported(msg);
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
static DBusMessage *remove_service(DBusConnection *conn,
if (service->network != NULL)
__connman_network_disconnect(service->network);
+ g_free(service->passphrase);
+ service->passphrase = NULL;
+
connman_service_set_favorite(service, FALSE);
__connman_storage_save_service(service);
src = g_hash_table_lookup(service_hash, service->identifier);
dst = g_hash_table_lookup(service_hash, target->identifier);
-#if 0
g_sequence_move(src, dst);
__connman_profile_changed();
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-#endif
- return __connman_error_not_implemented(msg);
}
static DBusMessage *move_after(DBusConnection *conn,
static GDBusMethodTable service_methods[] = {
{ "GetProperties", "", "a{sv}", get_properties },
{ "SetProperty", "sv", "", set_property },
+ { "ClearProperty", "s", "", clear_property },
{ "Connect", "", "", connect_service,
G_DBUS_METHOD_FLAG_ASYNC },
{ "Disconnect", "", "", disconnect_service },
service->favorite = FALSE;
service->hidden = FALSE;
+ service->ignore = FALSE;
+
service->order = 0;
}
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);
return 0;
}
+int __connman_service_connect(struct connman_service *service)
+{
+ int err;
+
+ DBG("service %p", service);
+
+ if (service->state == CONNMAN_SERVICE_STATE_READY)
+ return -EISCONN;
+
+ if (service->network != NULL) {
+ unsigned int ssid_len;
+
+ if (connman_network_get_blob(service->network, "WiFi.SSID",
+ &ssid_len) == NULL)
+ return -EINVAL;
+ connman_network_set_string(service->network,
+ "WiFi.Passphrase", service->passphrase);
+
+ err = __connman_network_connect(service->network);
+ } else if (service->device != NULL) {
+ if (service->favorite == FALSE)
+ return -ENOLINK;
+
+ err = __connman_device_connect(service->device);
+ } else
+ return -EOPNOTSUPP;
+
+ if (err < 0) {
+ if (err != -EINPROGRESS)
+ return err;
+
+ service->timeout = g_timeout_add_seconds(45,
+ connect_timeout, service);
+
+ return -EINPROGRESS;
+ }
+
+ return 0;
+}
+
+int __connman_service_disconnect(struct connman_service *service)
+{
+ int err;
+
+ DBG("service %p", service);
+
+ if (service->network != NULL) {
+ err = __connman_network_disconnect(service->network);
+ } else if (service->device != NULL) {
+ if (service->favorite == FALSE)
+ return -ENOLINK;
+ err = __connman_device_disconnect(service->device);
+ } else
+ return -EOPNOTSUPP;
+
+ if (err < 0) {
+ if (err != -EINPROGRESS)
+ return err;
+
+ return -EINPROGRESS;
+ }
+
+ return 0;
+}
+
/**
* __connman_service_lookup:
* @identifier: service identifier
case CONNMAN_DEVICE_TYPE_WIMAX:
case CONNMAN_DEVICE_TYPE_BLUETOOTH:
case CONNMAN_DEVICE_TYPE_GPS:
+ case CONNMAN_DEVICE_TYPE_MBM:
case CONNMAN_DEVICE_TYPE_HSO:
case CONNMAN_DEVICE_TYPE_NOZOMI:
case CONNMAN_DEVICE_TYPE_HUAWEI:
service_register(service);
+ if (service->favorite == TRUE)
+ __connman_service_auto_connect();
+
done:
g_free(name);
if (ident == NULL)
return NULL;
- group = __connman_network_get_group(network);
+ group = connman_network_get_group(network);
if (group == NULL)
return NULL;
unsigned int __connman_service_get_order(struct connman_service *service)
{
+ GSequenceIter *iter;
+
+ if (service == NULL)
+ return 0;
+
+ if (service->favorite == FALSE)
+ return 0;
+
+ iter = g_hash_table_lookup(service_hash, service->identifier);
+ if (iter != NULL) {
+ if (g_sequence_iter_get_position(iter) == 0)
+ return 1;
+ }
+
return service->order;
}
case CONNMAN_NETWORK_TYPE_VENDOR:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
- case CONNMAN_NETWORK_TYPE_HSO:
break;
+ case CONNMAN_NETWORK_TYPE_MBM:
+ case CONNMAN_NETWORK_TYPE_HSO:
+ return CONNMAN_SERVICE_TYPE_CELLULAR;
case CONNMAN_NETWORK_TYPE_WIFI:
return CONNMAN_SERVICE_TYPE_WIFI;
case CONNMAN_NETWORK_TYPE_WIMAX:
GSequenceIter *iter;
const char *str;
+ if (service->state == CONNMAN_SERVICE_STATE_READY)
+ return;
+
+ if (is_connecting(service) == TRUE)
+ return;
+
str = connman_network_get_string(network, "Name");
if (str != NULL) {
g_free(service->name);
const char *ident, *group;
char *name;
- if (__connman_service_lookup_from_network(network) != NULL) {
- connman_error("Service already exists");
- return NULL;
+ service = __connman_service_lookup_from_network(network);
+ if (service != NULL) {
+ update_from_network(service, network);
+ return service;
}
ident = __connman_network_get_ident(network);
if (ident == NULL)
return NULL;
- group = __connman_network_get_group(network);
+ group = connman_network_get_group(network);
if (group == NULL)
return NULL;
service_register(service);
+ if (service->favorite == TRUE)
+ __connman_service_auto_connect();
+
done:
g_free(name);
return service;
}
-static const char *error2string(enum connman_service_error error)
-{
- switch (error) {
- case CONNMAN_SERVICE_ERROR_UNKNOWN:
- break;
- case CONNMAN_SERVICE_ERROR_DHCP_FAILED:
- return "dhcp-failed";
- }
-
- return NULL;
-}
-
-static enum connman_service_error string2error(const char *error)
-{
- if (g_strcmp0(error, "dhcp-failed") == 0)
- return CONNMAN_SERVICE_ERROR_DHCP_FAILED;
-
- return CONNMAN_SERVICE_ERROR_UNKNOWN;
-}
-
static int service_load(struct connman_service *service)
{
GKeyFile *keyfile;
gchar *pathname, *data = NULL;
gsize length;
gchar *str;
+ unsigned int ssid_len;
+ int err = 0;
DBG("service %p", service);
case CONNMAN_SERVICE_TYPE_ETHERNET:
break;
case CONNMAN_SERVICE_TYPE_WIFI:
+ if (service->name == NULL) {
+ gchar *name;
+
+ name = g_key_file_get_string(keyfile,
+ service->identifier, "Name", NULL);
+ if (name != NULL) {
+ g_free(service->name);
+ service->name = name;
+ }
+
+ if (service->network != NULL)
+ connman_network_set_name(service->network,
+ name);
+ }
+
+ if (service->network &&
+ connman_network_get_blob(service->network,
+ "WiFi.SSID", &ssid_len) == NULL) {
+ gchar *hex_ssid;
+
+ hex_ssid = g_key_file_get_string(keyfile,
+ service->identifier,
+ "SSID", NULL);
+
+ if (hex_ssid != NULL) {
+ gchar *ssid;
+ unsigned int i, j = 0, hex;
+ size_t hex_ssid_len = strlen(hex_ssid);
+
+ ssid = g_try_malloc0(hex_ssid_len / 2);
+ if (ssid == NULL) {
+ g_free(hex_ssid);
+ err = -ENOMEM;
+ goto done;
+ }
+
+ for (i = 0; i < hex_ssid_len; i += 2) {
+ sscanf(hex_ssid + i, "%02x", &hex);
+ ssid[j++] = hex;
+ }
+
+ connman_network_set_blob(service->network,
+ "WiFi.SSID", ssid, hex_ssid_len / 2);
+ }
+
+ g_free(hex_ssid);
+ }
+ /* fall through */
+
case CONNMAN_SERVICE_TYPE_WIMAX:
case CONNMAN_SERVICE_TYPE_BLUETOOTH:
case CONNMAN_SERVICE_TYPE_CELLULAR:
__connman_ipconfig_load(service->ipconfig, keyfile,
service->identifier, "IPv4.");
+done:
g_key_file_free(keyfile);
- return 0;
+ return err;
}
static int service_save(struct connman_service *service)
gchar *pathname, *data = NULL;
gsize length;
gchar *str;
+ int err = 0;
DBG("service %p", service);
case CONNMAN_SERVICE_TYPE_ETHERNET:
break;
case CONNMAN_SERVICE_TYPE_WIFI:
+ if (service->network) {
+ const unsigned char *ssid;
+ unsigned int ssid_len = 0;
+
+ ssid = connman_network_get_blob(service->network,
+ "WiFi.SSID", &ssid_len);
+
+ if (ssid != NULL && ssid_len > 0 && ssid[0] != '\0') {
+ char *identifier = service->identifier;
+ GString *str;
+ unsigned int i;
+
+ str = g_string_sized_new(ssid_len * 2);
+ if (str == NULL) {
+ err = -ENOMEM;
+ goto done;
+ }
+
+ for (i = 0; i < ssid_len; i++)
+ g_string_append_printf(str,
+ "%02x", ssid[i]);
+
+ g_key_file_set_string(keyfile, identifier,
+ "SSID", str->str);
+
+ g_string_free(str, TRUE);
+ }
+ }
+ /* fall through */
+
case CONNMAN_SERVICE_TYPE_WIMAX:
case CONNMAN_SERVICE_TYPE_BLUETOOTH:
case CONNMAN_SERVICE_TYPE_CELLULAR:
if (service->passphrase != NULL)
g_key_file_set_string(keyfile, service->identifier,
"Passphrase", service->passphrase);
+ else
+ g_key_file_remove_key(keyfile, service->identifier,
+ "Passphrase", NULL);
__connman_ipconfig_save(service->ipconfig, keyfile,
service->identifier, "IPv4.");
g_free(pathname);
- return 0;
+ return err;
}
static struct connman_storage service_storage = {
projects / platform / upstream / connman.git / blobdiff