X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fnetwork.c;h=cf0586b87a47560f2a798ee5a83dbd52a8017412;hb=e76c122e6c313b881c019da638c243b0765bf06f;hp=2618dad909f0c90c860d377c2c21a99c8087eb73;hpb=925e46442d09bccaec4e5077011eb2c45189a3e2;p=connman diff --git a/src/network.c b/src/network.c index 2618dad..cf0586b 100644 --- a/src/network.c +++ b/src/network.c @@ -23,6 +23,7 @@ #include #endif +#include #include #include @@ -33,14 +34,17 @@ struct connman_network { struct connman_element element; enum connman_network_type type; enum connman_network_protocol protocol; + connman_bool_t associating; + connman_bool_t secondary; connman_bool_t available; connman_bool_t connected; - connman_bool_t remember; - connman_uint8_t priority; connman_uint8_t strength; + connman_uint16_t frequency; char *identifier; + char *address; char *name; char *node; + char *group; struct connman_network_driver *driver; void *driver_data; @@ -53,6 +57,7 @@ struct connman_network { void *ssid; int ssid_len; char *mode; + unsigned short channel; char *security; char *passphrase; } wifi; @@ -109,27 +114,25 @@ static DBusMessage *get_properties(DBusConnection *conn, DBUS_TYPE_OBJECT_PATH, &path); } + if (network->address != NULL) + connman_dbus_dict_append_variant(&dict, "Address", + DBUS_TYPE_STRING, &network->address); + if (network->name != NULL) connman_dbus_dict_append_variant(&dict, "Name", DBUS_TYPE_STRING, &network->name); - connman_dbus_dict_append_variant(&dict, "Available", - DBUS_TYPE_BOOLEAN, &network->available); - connman_dbus_dict_append_variant(&dict, "Connected", DBUS_TYPE_BOOLEAN, &network->connected); - connman_dbus_dict_append_variant(&dict, "Remember", - DBUS_TYPE_BOOLEAN, &network->remember); - - if (network->priority > 0) - connman_dbus_dict_append_variant(&dict, "Priority", - DBUS_TYPE_BYTE, &network->priority); - if (network->strength > 0) connman_dbus_dict_append_variant(&dict, "Strength", DBUS_TYPE_BYTE, &network->strength); + if (network->frequency > 0) + connman_dbus_dict_append_variant(&dict, "Frequency", + DBUS_TYPE_UINT16, &network->frequency); + if (network->wifi.ssid != NULL && network->wifi.ssid_len > 0) connman_dbus_dict_append_array(&dict, "WiFi.SSID", DBUS_TYPE_BYTE, &network->wifi.ssid, @@ -139,6 +142,10 @@ static DBusMessage *get_properties(DBusConnection *conn, connman_dbus_dict_append_variant(&dict, "WiFi.Mode", DBUS_TYPE_STRING, &network->wifi.mode); + if (network->wifi.channel > 0) + connman_dbus_dict_append_variant(&dict, "WiFi.Channel", + DBUS_TYPE_UINT16, &network->wifi.channel); + if (network->wifi.security != NULL) connman_dbus_dict_append_variant(&dict, "WiFi.Security", DBUS_TYPE_STRING, &network->wifi.security); @@ -177,19 +184,7 @@ static DBusMessage *set_property(DBusConnection *conn, type = dbus_message_iter_get_arg_type(&value); - if (g_str_equal(name, "Remember") == TRUE) { - connman_bool_t remember; - - if (type != DBUS_TYPE_BOOLEAN) - return __connman_error_invalid_arguments(msg); - - dbus_message_iter_get_basic(&value, &remember); - - if (network->remember == remember) - return __connman_error_invalid_arguments(msg); - - network->remember = remember; - } else if (g_str_equal(name, "WiFi.Passphrase") == TRUE) { + if (g_str_equal(name, "WiFi.Passphrase") == TRUE) { const char *passphrase; if (type != DBUS_TYPE_STRING) @@ -203,15 +198,6 @@ static DBusMessage *set_property(DBusConnection *conn, g_free(network->wifi.passphrase); network->wifi.passphrase = g_strdup(passphrase); - } else if (g_str_equal(name, "Priority") == TRUE) { - connman_uint8_t priority; - - if (type != DBUS_TYPE_BYTE) - return __connman_error_invalid_arguments(msg); - - dbus_message_iter_get_basic(&value, &priority); - - network->priority = priority; } __connman_storage_save_network(network); @@ -232,7 +218,7 @@ static DBusMessage *do_connect(DBusConnection *conn, return __connman_error_permission_denied(msg); if (network->connected == TRUE) - return __connman_error_failed(msg); + return __connman_error_failed(msg, EALREADY); if (network->driver && network->driver->connect) { enum connman_device_mode mode; @@ -243,7 +229,7 @@ static DBusMessage *do_connect(DBusConnection *conn, err = network->driver->connect(network); if (err < 0 && err != -EINPROGRESS) - return __connman_error_failed(msg); + return __connman_error_failed(msg, -err); } else network->connected = TRUE; @@ -263,7 +249,7 @@ static DBusMessage *do_disconnect(DBusConnection *conn, return __connman_error_permission_denied(msg); if (network->connected == FALSE) - return __connman_error_failed(msg); + return __connman_error_failed(msg, EINVAL); connman_element_unregister_children(&network->element); @@ -272,7 +258,7 @@ static DBusMessage *do_disconnect(DBusConnection *conn, if (network->driver && network->driver->disconnect) { err = network->driver->disconnect(network); if (err < 0 && err != -EINPROGRESS) - return __connman_error_failed(msg); + return __connman_error_failed(msg, -err); } else network->connected = FALSE; @@ -428,8 +414,10 @@ static void network_destruct(struct connman_element *element) g_free(network->wifi.security); g_free(network->wifi.passphrase); + g_free(network->group); g_free(network->node); g_free(network->name); + g_free(network->address); g_free(network->identifier); } @@ -448,7 +436,6 @@ struct connman_network *connman_network_create(const char *identifier, connman_uint8_t strength = 0; const char *str; char *temp; - unsigned int i; DBG("identifier %s type %d", identifier, type); @@ -460,19 +447,13 @@ struct connman_network *connman_network_create(const char *identifier, __connman_element_initialize(&network->element); + //temp = connman_dbus_encode_string(identifier); temp = g_strdup(identifier); if (temp == NULL) { g_free(network); return NULL; } - for (i = 0; i < strlen(temp); i++) { - char tmp = temp[i]; - if ((tmp < '0' || tmp > '9') && (tmp < 'A' || tmp > 'Z') && - (tmp < 'a' || tmp > 'z')) - temp[i] = '_'; - } - network->element.name = temp; network->element.type = CONNMAN_ELEMENT_TYPE_NETWORK; @@ -481,13 +462,12 @@ struct connman_network *connman_network_create(const char *identifier, str = type2string(type); if (str != NULL) - connman_element_set_static_property(&network->element, - "Type", DBUS_TYPE_STRING, &str); + connman_element_set_string(&network->element, "Type", str); - connman_element_set_static_property(&network->element, - "Strength", DBUS_TYPE_BYTE, &strength); + connman_element_set_uint8(&network->element, "Strength", strength); - network->type = type; + network->type = type; + network->secondary = FALSE; network->identifier = g_strdup(identifier); return network; @@ -518,6 +498,22 @@ void connman_network_unref(struct connman_network *network) connman_element_unref(&network->element); } +const char *__connman_network_get_type(struct connman_network *network) +{ + return type2string(network->type); +} + +/** + * connman_network_get_type: + * @network: network structure + * + * Get type of network + */ +enum connman_network_type connman_network_get_type(struct connman_network *network) +{ + return network->type; +} + /** * connman_network_get_identifier: * @network: network structure @@ -577,50 +573,74 @@ void connman_network_set_protocol(struct connman_network *network, } /** - * connman_network_set_available: + * connman_network_set_group: * @network: network structure - * @available: availability state + * @group: group name * - * Change availability state of network (in range) + * Set group name for automatic clustering */ -int connman_network_set_available(struct connman_network *network, - connman_bool_t available) +void connman_network_set_group(struct connman_network *network, + const char *group) { - DBusMessage *signal; - DBusMessageIter entry, value; - const char *key = "Available"; + if (network->secondary == TRUE) + return; - DBG("network %p available %d", network, available); + if (g_strcmp0(network->group, group) == 0) + return; - if (network->available == available) - return -EALREADY; + switch (network->type) { + case CONNMAN_NETWORK_TYPE_UNKNOWN: + case CONNMAN_NETWORK_TYPE_VENDOR: + case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: + case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: + case CONNMAN_NETWORK_TYPE_HSO: + return; + case CONNMAN_NETWORK_TYPE_WIFI: + case CONNMAN_NETWORK_TYPE_WIMAX: + break; + } - network->available = available; + if (network->group != NULL) { + __connman_profile_remove_network(network); - if (network->registered == FALSE) - return 0; + g_free(network->group); + } - if (network->connected == TRUE) - return 0; + network->group = g_strdup(group); - if (network->remember == FALSE) - return 0; + if (network->group != NULL) + __connman_profile_add_network(network); +} - signal = dbus_message_new_signal(network->element.path, - CONNMAN_NETWORK_INTERFACE, "PropertyChanged"); - if (signal == NULL) - return 0; +const char *__connman_network_get_group(struct connman_network *network) +{ + return network->group; +} - dbus_message_iter_init_append(signal, &entry); +const char *__connman_network_get_ident(struct connman_network *network) +{ + if (network->device == NULL) + return NULL; - dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); + return __connman_device_get_ident(network->device); +} - dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, - DBUS_TYPE_BOOLEAN_AS_STRING, &value); - dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN, &available); - dbus_message_iter_close_container(&entry, &value); +/** + * connman_network_set_available: + * @network: network structure + * @available: availability state + * + * Change availability state of network (in range) + */ +int connman_network_set_available(struct connman_network *network, + connman_bool_t available) +{ + DBG("network %p available %d", network, available); - g_dbus_send_message(connection, signal); + if (network->available == available) + return -EALREADY; + + network->available = available; return 0; } @@ -636,9 +656,40 @@ connman_bool_t connman_network_get_available(struct connman_network *network) return network->available; } +/** + * connman_network_set_associating: + * @network: network structure + * @associating: associating state + * + * Change associating state of network + */ +int connman_network_set_associating(struct connman_network *network, + connman_bool_t associating) +{ + DBG("network %p associating %d", network, associating); + + if (network->associating == associating) + return -EALREADY; + + network->associating = associating; + + if (associating == TRUE) { + struct connman_service *service; + + service = __connman_service_lookup_from_network(network); + __connman_service_indicate_state(service, + CONNMAN_SERVICE_STATE_ASSOCIATION); + } + + return 0; +} + static gboolean set_connected(gpointer user_data) { struct connman_network *network = user_data; + struct connman_service *service; + + service = __connman_service_lookup_from_network(network); if (network->connected == TRUE) { struct connman_element *element; @@ -669,8 +720,14 @@ static gboolean set_connected(gpointer user_data) if (connman_element_register(element, &network->element) < 0) connman_element_unref(element); + + __connman_service_indicate_state(service, + CONNMAN_SERVICE_STATE_CONFIGURATION); } } else { + __connman_service_indicate_state(service, + CONNMAN_SERVICE_STATE_IDLE); + connman_element_unregister_children(&network->element); __connman_device_set_network(network->device, NULL); @@ -702,6 +759,9 @@ int connman_network_set_connected(struct connman_network *network, network->connected = connected; + if (connected == TRUE) + network->associating = FALSE; + if (network->registered == FALSE) { g_idle_add(set_connected, network); return 0; @@ -740,89 +800,133 @@ connman_bool_t connman_network_get_connected(struct connman_network *network) } /** - * connman_network_set_remember: + * __connman_network_connect: * @network: network structure - * @remember: remember state * - * Change remember state of network (known networks) + * Connect network */ -int connman_network_set_remember(struct connman_network *network, - connman_bool_t remember) +int __connman_network_connect(struct connman_network *network) { - DBusMessage *signal; - DBusMessageIter entry, value; - const char *key = "Remember"; + int err; - DBG("network %p remember %d", network, remember); + DBG("network %p", network); - if (network->remember == remember) + if (network->connected == TRUE) return -EALREADY; - network->remember = remember; + if (network->driver == NULL) + return -EUNATCH; - if (network->registered == FALSE) - return 0; + if (network->driver->connect == NULL) + return -ENOSYS; - signal = dbus_message_new_signal(network->element.path, - CONNMAN_NETWORK_INTERFACE, "PropertyChanged"); - if (signal == NULL) - return 0; + __connman_device_disconnect(network->device); - dbus_message_iter_init_append(signal, &entry); + err = network->driver->connect(network); + if (err == 0) { + network->connected = TRUE; + set_connected(network); + } - dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); + return err; +} - dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, - DBUS_TYPE_BOOLEAN_AS_STRING, &value); - dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN, &remember); - dbus_message_iter_close_container(&entry, &value); +/** + * __connman_network_disconnect: + * @network: network structure + * + * Disconnect network + */ +int __connman_network_disconnect(struct connman_network *network) +{ + int err; - g_dbus_send_message(connection, signal); + DBG("network %p", network); - return 0; + if (network->connected == FALSE) + return -ENOTCONN; + + if (network->driver == NULL) + return -EUNATCH; + + if (network->driver->disconnect == NULL) + return -ENOSYS; + + err = network->driver->disconnect(network); + if (err == 0) { + network->connected = FALSE; + set_connected(network); + } + + return err; } /** - * connman_network_get_remember: + * connman_network_set_address: * @network: network structure + * @address: binary address value + * @size: binary address length * - * Get network remember setting + * Set unique address value for network */ -connman_bool_t connman_network_get_remember(struct connman_network *network) +int connman_network_set_address(struct connman_network *network, + const void *address, unsigned int size) { - return network->remember; + const unsigned char *addr_octet = address; + char *str; + + DBG("network %p size %d", network, size); + + if (size != 6) + return -EINVAL; + + str = g_strdup_printf("%02X:%02X:%02X:%02X:%02X:%02X", + addr_octet[0], addr_octet[1], addr_octet[2], + addr_octet[3], addr_octet[4], addr_octet[5]); + if (str == NULL) + return -ENOMEM; + + g_free(network->address); + network->address = str; + + return connman_element_set_string(&network->element, + "Address", network->address); } /** - * connman_network_connect: + * connman_network_set_name: * @network: network structure + * @name: name value * - * Connect network + * Set display name value for network */ -int connman_network_connect(struct connman_network *network) +int connman_network_set_name(struct connman_network *network, + const char *name) { - if (network->connected == TRUE) - return -EALREADY; - - if (network->driver && network->driver->connect) - return network->driver->connect(network); + DBG("network %p name %s", network, name); - network->connected = TRUE; + g_free(network->name); + network->name = g_strdup(name); - return 0; + return connman_element_set_string(&network->element, "Name", name); } -int __connman_network_disconnect(struct connman_network *network) +/** + * connman_network_set_strength: + * @network: network structure + * @strength: strength value + * + * Set signal strength value for network + */ +int connman_network_set_strength(struct connman_network *network, + connman_uint8_t strength) { - if (network->connected == FALSE) - return -ENOTCONN; + DBG("network %p strengh %d", network, strength); - if (network->driver && network->driver->disconnect) - return network->driver->disconnect(network); - - network->connected = FALSE; + network->strength = strength; - return 0; + return connman_element_set_uint8(&network->element, + "Strength", strength); } /** @@ -838,9 +942,12 @@ int connman_network_set_string(struct connman_network *network, { DBG("network %p key %s value %s", network, key, value); - if (g_str_equal(key, "Name") == TRUE) { - g_free(network->name); - network->name = g_strdup(value); + if (g_strcmp0(key, "Name") == 0) + return connman_network_set_name(network, value); + + if (g_str_equal(key, "Address") == TRUE) { + g_free(network->address); + network->address = g_strdup(value); } else if (g_str_equal(key, "Node") == TRUE) { g_free(network->node); network->node = g_strdup(value); @@ -855,7 +962,7 @@ int connman_network_set_string(struct connman_network *network, network->wifi.passphrase = g_strdup(value); } - return 0; + return connman_element_set_string(&network->element, key, value); } /** @@ -870,7 +977,9 @@ const char *connman_network_get_string(struct connman_network *network, { DBG("network %p key %s", network, key); - if (g_str_equal(key, "Name") == TRUE) + if (g_str_equal(key, "Address") == TRUE) + return network->address; + else if (g_str_equal(key, "Name") == TRUE) return network->name; else if (g_str_equal(key, "Node") == TRUE) return network->node; @@ -881,7 +990,7 @@ const char *connman_network_get_string(struct connman_network *network, else if (g_str_equal(key, "WiFi.Passphrase") == TRUE) return network->wifi.passphrase; - return NULL; + return connman_element_get_string(&network->element, key); } /** @@ -897,15 +1006,10 @@ int connman_network_set_uint8(struct connman_network *network, { DBG("network %p key %s value %d", network, key, value); - if (g_str_equal(key, "Priority") == TRUE) - network->priority = value; - else if (g_str_equal(key, "Strength") == TRUE) { - network->strength = value; - connman_element_set_static_property(&network->element, - "Strength", DBUS_TYPE_BYTE, &value); - } + if (g_strcmp0(key, "Strength") == 0) + return connman_network_set_strength(network, value); - return 0; + return connman_element_set_uint8(&network->element, key, value); } /** @@ -920,11 +1024,50 @@ connman_uint8_t connman_network_get_uint8(struct connman_network *network, { DBG("network %p key %s", network, key); - if (g_str_equal(key, "Priority") == TRUE) - return network->priority; - else if (g_str_equal(key, "Strength") == TRUE) + if (g_str_equal(key, "Strength") == TRUE) return network->strength; + return connman_element_get_uint8(&network->element, key); +} + +/** + * connman_network_set_uint16: + * @network: network structure + * @key: unique identifier + * @value: integer value + * + * Set integer value for specific key + */ +int connman_network_set_uint16(struct connman_network *network, + const char *key, connman_uint16_t value) +{ + DBG("network %p key %s value %d", network, key, value); + + if (g_str_equal(key, "Frequency") == TRUE) + network->frequency = value; + else if (g_str_equal(key, "WiFi.Channel") == TRUE) + network->wifi.channel = value; + + return -EINVAL; +} + +/** + * connman_network_get_uint16: + * @network: network structure + * @key: unique identifier + * + * Get integer value for specific key + */ +connman_uint16_t connman_network_get_uint16(struct connman_network *network, + const char *key) +{ + DBG("network %p key %s", network, key); + + if (g_str_equal(key, "Frequency") == TRUE) + return network->frequency; + else if (g_str_equal(key, "WiFi.Channel") == TRUE) + return network->wifi.channel; + return 0; } @@ -942,6 +1085,9 @@ int connman_network_set_blob(struct connman_network *network, { DBG("network %p key %s size %d", network, key, size); + if (g_strcmp0(key, "Address") == 0) + return connman_network_set_address(network, data, size); + if (g_str_equal(key, "WiFi.SSID") == TRUE) { g_free(network->wifi.ssid); network->wifi.ssid = g_try_malloc(size); @@ -952,7 +1098,7 @@ int connman_network_set_blob(struct connman_network *network, network->wifi.ssid_len = 0; } - return 0; + return connman_element_set_blob(&network->element, key, data, size); } /** @@ -974,7 +1120,7 @@ const void *connman_network_get_blob(struct connman_network *network, return network->wifi.ssid; } - return NULL; + return connman_element_get_blob(&network->element, key, size); } void __connman_network_set_device(struct connman_network *network, @@ -1062,7 +1208,21 @@ static int network_probe(struct connman_element *element) return err; } - __connman_profile_add_network(network); + network->secondary = connman_device_get_secondary(network->device); + + switch (network->type) { + case CONNMAN_NETWORK_TYPE_UNKNOWN: + 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_WIFI: + case CONNMAN_NETWORK_TYPE_WIMAX: + if (network->group != NULL && network->secondary == FALSE) + __connman_profile_add_network(network); + break; + } return 0; } @@ -1079,7 +1239,23 @@ static void network_remove(struct connman_element *element) if (network->driver == NULL) return; - __connman_profile_remove_network(network); + switch (network->type) { + case CONNMAN_NETWORK_TYPE_UNKNOWN: + 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_WIFI: + case CONNMAN_NETWORK_TYPE_WIMAX: + if (network->group != NULL && network->secondary == FALSE) { + __connman_profile_remove_network(network); + + g_free(network->group); + network->group = NULL; + } + break; + } unregister_interface(element); @@ -1087,145 +1263,40 @@ static void network_remove(struct connman_element *element) network->driver->remove(network); } -static struct connman_driver network_driver = { - .name = "network", - .type = CONNMAN_ELEMENT_TYPE_NETWORK, - .priority = CONNMAN_DRIVER_PRIORITY_LOW, - .probe = network_probe, - .remove = network_remove, -}; - -static int network_init(struct connman_device *device) -{ - DBG("device %p", device); - - return 0; -} - -static int network_load(struct connman_network *network) -{ - GKeyFile *keyfile; - gchar *pathname, *data = NULL; - gsize length; - const char *name; - int val; - - DBG("network %p", network); - - name = connman_device_get_name(network->device); - if (name == NULL) - return -EINVAL; - - pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR, name); - if (pathname == NULL) - return -ENOMEM; - - keyfile = g_key_file_new(); - - if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE) { - g_free(pathname); - return -ENOENT; - } - - g_free(pathname); - - if (g_key_file_load_from_data(keyfile, data, length, - 0, NULL) == FALSE) { - g_free(data); - return -EILSEQ; - } - - g_free(data); - - network->remember = g_key_file_get_boolean(keyfile, - network->identifier, "Remember", NULL); - - val = g_key_file_get_integer(keyfile, network->identifier, - "Priority", NULL); - if (val > 0) - network->priority = val; - - g_free(network->wifi.security); - network->wifi.security = g_key_file_get_string(keyfile, - network->identifier, "WiFi.Security", NULL); - - g_free(network->wifi.passphrase); - network->wifi.passphrase = g_key_file_get_string(keyfile, - network->identifier, "WiFi.Passphrase", NULL); - - g_key_file_free(keyfile); - - return 0; -} - -static int network_save(struct connman_network *network) +static void network_change(struct connman_element *element) { - GKeyFile *keyfile; - gchar *pathname, *data = NULL; - gsize length; - const char *name; - - DBG("network %p", network); - - name = connman_device_get_name(network->device); - if (name == NULL) - return -EINVAL; - - pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR, name); - if (pathname == NULL) - return -ENOMEM; - - keyfile = g_key_file_new(); + struct connman_network *network = element->network; - if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE) - goto update; + DBG("element %p name %s", element, element->name); - if (length > 0) { - if (g_key_file_load_from_data(keyfile, data, length, - 0, NULL) == FALSE) - goto done; - } + if (element->state != CONNMAN_ELEMENT_STATE_ERROR) + return; - g_free(data); + if (element->error != CONNMAN_ELEMENT_ERROR_DHCP_FAILED) + return; -update: - g_key_file_set_boolean(keyfile, network->identifier, - "Remember", network->remember); + if (network->connected == FALSE) + return; - if (network->priority > 0) - g_key_file_set_integer(keyfile, network->identifier, - "Priority", network->priority); + connman_element_unregister_children(element); - if (network->remember == TRUE || network->connected == TRUE) { - if (network->wifi.security != NULL) - g_key_file_set_string(keyfile, network->identifier, - "WiFi.Security", network->wifi.security); + connman_device_set_disconnected(network->device, TRUE); - if (network->wifi.passphrase != NULL) - g_key_file_set_string(keyfile, network->identifier, - "WiFi.Passphrase", network->wifi.passphrase); + if (network->driver && network->driver->disconnect) { + network->driver->disconnect(network); + return; } - data = g_key_file_to_data(keyfile, &length, NULL); - - g_file_set_contents(pathname, data, length, NULL); - -done: - g_free(data); - - g_key_file_free(keyfile); - - g_free(pathname); - - return 0; + network->connected = FALSE; } -static struct connman_storage network_storage = { +static struct connman_driver network_driver = { .name = "network", - .priority = CONNMAN_STORAGE_PRIORITY_LOW, - .network_init = network_init, - .network_load = network_load, - .network_save = network_save, + .type = CONNMAN_ELEMENT_TYPE_NETWORK, + .priority = CONNMAN_DRIVER_PRIORITY_LOW, + .probe = network_probe, + .remove = network_remove, + .change = network_change, }; int __connman_network_init(void) @@ -1234,9 +1305,6 @@ int __connman_network_init(void) connection = connman_dbus_get_connection(); - if (connman_storage_register(&network_storage) < 0) - connman_error("Failed to register network storage"); - return connman_driver_register(&network_driver); } @@ -1246,7 +1314,5 @@ void __connman_network_cleanup(void) connman_driver_unregister(&network_driver); - connman_storage_unregister(&network_storage); - dbus_connection_unref(connection); }