X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fnetwork.c;h=a83b921de1b2d362d5bd79cf9ffca0375677752c;hb=1f51bad6c5ad8510a9012299f87a7d3f31054c80;hp=e0f0fa81224c47c44b16d2f3c2fdf881150c8679;hpb=a26a66263673f9c91f71a4e915bd25f9d3e0afc0;p=connman diff --git a/src/network.c b/src/network.c index e0f0fa8..a83b921 100644 --- a/src/network.c +++ b/src/network.c @@ -39,8 +39,10 @@ struct connman_network { connman_uint8_t priority; connman_uint8_t strength; char *identifier; + char *address; char *name; char *node; + char *group; struct connman_network_driver *driver; void *driver_data; @@ -109,6 +111,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); @@ -428,8 +434,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); } @@ -481,11 +489,9 @@ 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->identifier = g_strdup(identifier); @@ -577,6 +583,20 @@ void connman_network_set_protocol(struct connman_network *network, } /** + * connman_network_set_group: + * @network: network structure + * @group: group name + * + * Set group name for automatic clustering + */ +void connman_network_set_group(struct connman_network *network, + const char *group) +{ + g_free(network->group); + network->group = g_strdup(group); +} + +/** * connman_network_set_available: * @network: network structure * @available: availability state @@ -636,48 +656,11 @@ connman_bool_t connman_network_get_available(struct connman_network *network) return network->available; } -/** - * 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) +static gboolean set_connected(gpointer user_data) { - DBusMessage *signal; - DBusMessageIter entry, value; - const char *key = "Connected"; - - DBG("network %p connected %d", network, connected); - - if (network->connected == connected) - return -EALREADY; + struct connman_network *network = user_data; - network->connected = connected; - - if (network->registered == FALSE) - goto connected; - - 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); - -connected: - if (connected == TRUE) { + if (network->connected == TRUE) { struct connman_element *element; enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN; @@ -715,6 +698,53 @@ connected: __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 (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; } @@ -807,6 +837,8 @@ int __connman_network_disconnect(struct connman_network *network) if (network->connected == FALSE) return -ENOTCONN; + connman_element_unregister_children(&network->element); + if (network->driver && network->driver->disconnect) return network->driver->disconnect(network); @@ -828,7 +860,10 @@ 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) { + if (g_str_equal(key, "Address") == TRUE) { + g_free(network->address); + network->address = g_strdup(value); + } else if (g_str_equal(key, "Name") == TRUE) { g_free(network->name); network->name = g_strdup(value); } else if (g_str_equal(key, "Node") == TRUE) { @@ -845,7 +880,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); } /** @@ -860,7 +895,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; @@ -871,7 +908,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); } /** @@ -889,13 +926,10 @@ int connman_network_set_uint8(struct connman_network *network, if (g_str_equal(key, "Priority") == TRUE) network->priority = value; - else if (g_str_equal(key, "Strength") == TRUE) { + else if (g_str_equal(key, "Strength") == TRUE) network->strength = value; - connman_element_set_static_property(&network->element, - "Strength", DBUS_TYPE_BYTE, &value); - } - return 0; + return connman_element_set_uint8(&network->element, key, value); } /** @@ -915,7 +949,7 @@ connman_uint8_t connman_network_get_uint8(struct connman_network *network, else if (g_str_equal(key, "Strength") == TRUE) return network->strength; - return 0; + return connman_element_get_uint8(&network->element, key); } /** @@ -942,7 +976,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); } /** @@ -964,7 +998,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, @@ -1052,6 +1086,8 @@ static int network_probe(struct connman_element *element) return err; } + __connman_profile_add_network(network); + return 0; } @@ -1067,18 +1103,48 @@ static void network_remove(struct connman_element *element) if (network->driver == NULL) return; + __connman_profile_remove_network(network); + unregister_interface(element); if (network->driver->remove) network->driver->remove(network); } +static void network_change(struct connman_element *element) +{ + struct connman_network *network = element->network; + + DBG("element %p name %s", element, element->name); + + if (element->state != CONNMAN_ELEMENT_STATE_ERROR) + return; + + if (element->error != CONNMAN_ELEMENT_ERROR_DHCP_FAILED) + return; + + if (network->connected == FALSE) + return; + + connman_element_unregister_children(element); + + connman_device_set_disconnected(network->device, TRUE); + + if (network->driver && network->driver->disconnect) { + network->driver->disconnect(network); + return; + } + + network->connected = FALSE; +} + static struct connman_driver network_driver = { .name = "network", .type = CONNMAN_ELEMENT_TYPE_NETWORK, .priority = CONNMAN_DRIVER_PRIORITY_LOW, .probe = network_probe, .remove = network_remove, + .change = network_change, }; static int network_init(struct connman_device *device) @@ -1094,6 +1160,7 @@ static int network_load(struct connman_network *network) gchar *pathname, *data = NULL; gsize length; const char *name; + char *str; int val; DBG("network %p", network); @@ -1131,13 +1198,19 @@ static int network_load(struct connman_network *network) if (val > 0) network->priority = val; - g_free(network->wifi.security); - network->wifi.security = g_key_file_get_string(keyfile, + str = g_key_file_get_string(keyfile, network->identifier, "WiFi.Security", NULL); + if (str != NULL) { + g_free(network->wifi.security); + network->wifi.security = str; + } - g_free(network->wifi.passphrase); - network->wifi.passphrase = g_key_file_get_string(keyfile, + str = g_key_file_get_string(keyfile, network->identifier, "WiFi.Passphrase", NULL); + if (str != NULL) { + g_free(network->wifi.passphrase); + network->wifi.passphrase = str; + } g_key_file_free(keyfile);