X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fnetwork.c;h=cf0586b87a47560f2a798ee5a83dbd52a8017412;hb=e76c122e6c313b881c019da638c243b0765bf06f;hp=7b0ed7a4d1fed3e6b3312fe34fc96c6b9e3f2af6;hpb=77b134b5f3f2856cd6a915904b9ff3b207654c71;p=connman diff --git a/src/network.c b/src/network.c index 7b0ed7a..cf0586b 100644 --- a/src/network.c +++ b/src/network.c @@ -23,6 +23,7 @@ #include #endif +#include #include #include @@ -33,12 +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 strength; + connman_uint16_t frequency; char *identifier; + char *address; char *name; char *node; + char *group; struct connman_network_driver *driver; void *driver_data; @@ -51,6 +57,7 @@ struct connman_network { void *ssid; int ssid_len; char *mode; + unsigned short channel; char *security; char *passphrase; } wifi; @@ -64,6 +71,8 @@ static const char *type2string(enum connman_network_type type) break; case CONNMAN_NETWORK_TYPE_WIFI: return "wifi"; + case CONNMAN_NETWORK_TYPE_WIMAX: + return "wimax"; case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: return "bluetooth"; @@ -105,6 +114,10 @@ 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); @@ -112,13 +125,14 @@ static DBusMessage *get_properties(DBusConnection *conn, 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->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, @@ -128,11 +142,17 @@ 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); - if (network->wifi.passphrase != NULL) + if (network->wifi.passphrase != NULL && + __connman_security_check_privilege(msg, + CONNMAN_SECURITY_PRIVILEGE_SECRET) == 0) connman_dbus_dict_append_variant(&dict, "WiFi.Passphrase", DBUS_TYPE_STRING, &network->wifi.passphrase); @@ -147,6 +167,7 @@ static DBusMessage *set_property(DBusConnection *conn, struct connman_network *network = data; DBusMessageIter iter, value; const char *name; + int type; DBG("conn %p", conn); @@ -161,15 +182,17 @@ static DBusMessage *set_property(DBusConnection *conn, CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0) return __connman_error_permission_denied(msg); - if (g_str_equal(name, "Remember") == TRUE) { - connman_bool_t remember; + type = dbus_message_iter_get_arg_type(&value); - dbus_message_iter_get_basic(&value, &remember); + if (g_str_equal(name, "WiFi.Passphrase") == TRUE) { + const char *passphrase; - if (network->remember == remember) + if (type != DBUS_TYPE_STRING) return __connman_error_invalid_arguments(msg); - } else if (g_str_equal(name, "WiFi.Passphrase") == TRUE) { - const char *passphrase; + + if (__connman_security_check_privilege(msg, + CONNMAN_SECURITY_PRIVILEGE_SECRET) < 0) + return __connman_error_permission_denied(msg); dbus_message_iter_get_basic(&value, &passphrase); @@ -195,12 +218,18 @@ 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; + + mode = connman_device_get_mode(network->device); + if (mode == CONNMAN_DEVICE_MODE_NETWORK_SINGLE) + __connman_device_disconnect(network->device); + 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; @@ -220,14 +249,16 @@ 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); + connman_device_set_disconnected(network->device, TRUE); + 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; @@ -272,11 +303,12 @@ static void append_networks(struct connman_device *device, static void emit_networks_signal(struct connman_device *device) { + const char *path = connman_device_get_path(device); DBusMessage *signal; DBusMessageIter entry; - signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "PropertyChanged"); + signal = dbus_message_new_signal(path, + CONNMAN_DEVICE_INTERFACE, "PropertyChanged"); if (signal == NULL) return; @@ -382,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); } @@ -401,6 +435,7 @@ struct connman_network *connman_network_create(const char *identifier, struct connman_network *network; connman_uint8_t strength = 0; const char *str; + char *temp; DBG("identifier %s type %d", identifier, type); @@ -410,24 +445,29 @@ struct connman_network *connman_network_create(const char *identifier, DBG("network %p", network); - network->element.refcount = 1; + __connman_element_initialize(&network->element); - network->element.name = g_strdup(identifier); + //temp = connman_dbus_encode_string(identifier); + temp = g_strdup(identifier); + if (temp == NULL) { + g_free(network); + return NULL; + } + + network->element.name = temp; network->element.type = CONNMAN_ELEMENT_TYPE_NETWORK; - network->element.index = -1; network->element.network = network; network->element.destruct = network_destruct; str = type2string(type); if (str != NULL) - connman_element_add_static_property(&network->element, - "Type", DBUS_TYPE_STRING, &str); + connman_element_set_string(&network->element, "Type", str); - connman_element_add_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; @@ -458,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 @@ -517,23 +573,125 @@ void connman_network_set_protocol(struct connman_network *network, } /** - * connman_network_set_connected: + * connman_network_set_group: * @network: network structure - * @connected: connected state + * @group: group name * - * Change connected state of network + * Set group name for automatic clustering */ -int connman_network_set_connected(struct connman_network *network, - connman_bool_t connected) +void connman_network_set_group(struct connman_network *network, + const char *group) { - DBG("network %p connected %d", network, connected); + if (network->secondary == TRUE) + return; - if (network->connected == connected) + if (g_strcmp0(network->group, group) == 0) + return; + + 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; + } + + if (network->group != NULL) { + __connman_profile_remove_network(network); + + g_free(network->group); + } + + network->group = g_strdup(group); + + if (network->group != NULL) + __connman_profile_add_network(network); +} + +const char *__connman_network_get_group(struct connman_network *network) +{ + return network->group; +} + +const char *__connman_network_get_ident(struct connman_network *network) +{ + if (network->device == NULL) + return NULL; + + return __connman_device_get_ident(network->device); +} + +/** + * 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); + + if (network->available == available) return -EALREADY; - network->connected = connected; + network->available = available; + + return 0; +} + +/** + * connman_network_get_available: + * @network: network structure + * + * Get network available setting + */ +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 (connected == TRUE) { + 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; enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN; @@ -550,6 +708,10 @@ int connman_network_set_connected(struct connman_network *network, __connman_device_increase_connections(network->device); + __connman_device_set_network(network->device, network); + + connman_device_set_disconnected(network->device, FALSE); + element = connman_element_create(NULL); if (element != NULL) { element->type = type; @@ -558,44 +720,213 @@ int connman_network_set_connected(struct connman_network *network, 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); + __connman_device_decrease_connections(network->device); } + return FALSE; +} + +/** + * connman_network_set_connected: + * @network: network structure + * @connected: connected state + * + * Change connected state of network + */ +int connman_network_set_connected(struct connman_network *network, + connman_bool_t connected) +{ + DBusMessage *signal; + DBusMessageIter entry, value; + const char *key = "Connected"; + + DBG("network %p connected %d", network, connected); + + if (network->connected == connected) + return -EALREADY; + + network->connected = connected; + + if (connected == TRUE) + network->associating = FALSE; + + if (network->registered == FALSE) { + g_idle_add(set_connected, network); + return 0; + } + + signal = dbus_message_new_signal(network->element.path, + CONNMAN_NETWORK_INTERFACE, "PropertyChanged"); + if (signal == NULL) + return 0; + + dbus_message_iter_init_append(signal, &entry); + + dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key); + + dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT, + DBUS_TYPE_BOOLEAN_AS_STRING, &value); + dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN, &connected); + dbus_message_iter_close_container(&entry, &value); + + g_dbus_send_message(connection, signal); + + set_connected(network); + return 0; } /** - * connman_network_get_remember: + * connman_network_get_connected: * @network: network structure * - * Get network remember setting + * Get network connection status */ -connman_bool_t connman_network_get_remember(struct connman_network *network) +connman_bool_t connman_network_get_connected(struct connman_network *network) { - return network->remember; + return network->connected; } /** - * connman_network_connect: + * __connman_network_connect: * @network: network structure * * Connect network */ -int connman_network_connect(struct connman_network *network) +int __connman_network_connect(struct connman_network *network) { + int err; + + DBG("network %p", network); + if (network->connected == TRUE) return -EALREADY; - if (network->driver && network->driver->connect) - return network->driver->connect(network); + if (network->driver == NULL) + return -EUNATCH; + + if (network->driver->connect == NULL) + return -ENOSYS; - network->connected = TRUE; + __connman_device_disconnect(network->device); - return 0; + err = network->driver->connect(network); + if (err == 0) { + network->connected = TRUE; + set_connected(network); + } + + return err; +} + +/** + * __connman_network_disconnect: + * @network: network structure + * + * Disconnect network + */ +int __connman_network_disconnect(struct connman_network *network) +{ + int err; + + DBG("network %p", network); + + 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_set_address: + * @network: network structure + * @address: binary address value + * @size: binary address length + * + * Set unique address value for network + */ +int connman_network_set_address(struct connman_network *network, + const void *address, unsigned int size) +{ + 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_set_name: + * @network: network structure + * @name: name value + * + * Set display name value for network + */ +int connman_network_set_name(struct connman_network *network, + const char *name) +{ + DBG("network %p name %s", network, name); + + g_free(network->name); + network->name = g_strdup(name); + + return connman_element_set_string(&network->element, "Name", name); +} + +/** + * 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) +{ + DBG("network %p strengh %d", network, strength); + + network->strength = strength; + + return connman_element_set_uint8(&network->element, + "Strength", strength); } /** @@ -611,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); @@ -628,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); } /** @@ -643,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; @@ -654,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); } /** @@ -670,11 +1006,67 @@ int connman_network_set_uint8(struct connman_network *network, { DBG("network %p key %s value %d", network, key, value); - 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 connman_element_set_uint8(&network->element, key, value); +} + +/** + * connman_network_get_uint8: + * @network: network structure + * @key: unique identifier + * + * Get integer value for specific key + */ +connman_uint8_t connman_network_get_uint8(struct connman_network *network, + const char *key) +{ + DBG("network %p key %s", network, key); + + 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; } @@ -693,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); @@ -703,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); } /** @@ -725,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, @@ -813,6 +1208,22 @@ static int network_probe(struct connman_element *element) return err; } + 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; } @@ -828,131 +1239,64 @@ static void network_remove(struct connman_element *element) if (network->driver == NULL) return; + 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); if (network->driver->remove) 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_load(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(); - - 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); - - 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; -} + struct connman_network *network = element->network; -static int network_save(struct connman_network *network) -{ - GKeyFile *keyfile; - gchar *pathname, *data = NULL; - gsize length; - const char *name; + DBG("element %p name %s", element, element->name); - DBG("network %p", network); + if (element->state != CONNMAN_ELEMENT_STATE_ERROR) + return; - name = connman_device_get_name(network->device); - if (name == NULL) - return -EINVAL; + if (element->error != CONNMAN_ELEMENT_ERROR_DHCP_FAILED) + return; - pathname = g_strdup_printf("%s/%s.conf", STORAGEDIR, name); - if (pathname == NULL) - return -ENOMEM; + if (network->connected == FALSE) + return; - keyfile = g_key_file_new(); + connman_element_unregister_children(element); - if (g_file_get_contents(pathname, &data, &length, NULL) == FALSE) - goto update; + connman_device_set_disconnected(network->device, TRUE); - if (length > 0) { - if (g_key_file_load_from_data(keyfile, data, length, - 0, NULL) == FALSE) - goto done; + if (network->driver && network->driver->disconnect) { + network->driver->disconnect(network); + return; } - g_free(data); - -update: - g_key_file_set_boolean(keyfile, network->identifier, - "Remember", network->remember); - - if (network->wifi.security != NULL) - g_key_file_set_string(keyfile, network->identifier, - "WiFi.Security", network->wifi.security); - - if (network->wifi.passphrase != NULL) - g_key_file_set_string(keyfile, network->identifier, - "WiFi.Passphrase", network->wifi.passphrase); - - 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_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) @@ -961,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); } @@ -973,7 +1314,5 @@ void __connman_network_cleanup(void) connman_driver_unregister(&network_driver); - connman_storage_unregister(&network_storage); - dbus_connection_unref(connection); }