X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fnetwork.c;h=4a7b8f2d4f148d2e74857c009b64061730fa209e;hb=9f02a110ab06991b9bcce6ff1ff651c2069eb3ad;hp=7b0ed7a4d1fed3e6b3312fe34fc96c6b9e3f2af6;hpb=77b134b5f3f2856cd6a915904b9ff3b207654c71;p=connman diff --git a/src/network.c b/src/network.c index 7b0ed7a..4a7b8f2 100644 --- a/src/network.c +++ b/src/network.c @@ -33,8 +33,10 @@ struct connman_network { struct connman_element element; enum connman_network_type type; enum connman_network_protocol protocol; + connman_bool_t available; connman_bool_t connected; connman_bool_t remember; + connman_uint8_t priority; connman_uint8_t strength; char *identifier; char *name; @@ -109,12 +111,19 @@ static DBusMessage *get_properties(DBusConnection *conn, 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); @@ -132,7 +141,9 @@ static DBusMessage *get_properties(DBusConnection *conn, 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 +158,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,20 +173,43 @@ static DBusMessage *set_property(DBusConnection *conn, CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0) return __connman_error_permission_denied(msg); + 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) { const char *passphrase; + if (type != DBUS_TYPE_STRING) + return __connman_error_invalid_arguments(msg); + + if (__connman_security_check_privilege(msg, + CONNMAN_SECURITY_PRIVILEGE_SECRET) < 0) + return __connman_error_permission_denied(msg); + dbus_message_iter_get_basic(&value, &passphrase); 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); @@ -198,6 +233,12 @@ static DBusMessage *do_connect(DBusConnection *conn, return __connman_error_failed(msg); 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); @@ -272,11 +313,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; @@ -410,21 +452,20 @@ 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); 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, + connman_element_set_static_property(&network->element, "Type", DBUS_TYPE_STRING, &str); - connman_element_add_static_property(&network->element, + connman_element_set_static_property(&network->element, "Strength", DBUS_TYPE_BYTE, &strength); network->type = type; @@ -517,6 +558,66 @@ void connman_network_set_protocol(struct connman_network *network, } /** + * 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) +{ + DBusMessage *signal; + DBusMessageIter entry, value; + const char *key = "Available"; + + DBG("network %p available %d", network, available); + + if (network->available == available) + return -EALREADY; + + network->available = available; + + if (network->registered == FALSE) + return 0; + + if (network->connected == TRUE) + return 0; + + if (network->remember == FALSE) + 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, &available); + dbus_message_iter_close_container(&entry, &value); + + g_dbus_send_message(connection, signal); + + 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_connected: * @network: network structure * @connected: connected state @@ -526,6 +627,10 @@ void connman_network_set_protocol(struct connman_network *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) @@ -533,6 +638,25 @@ int connman_network_set_connected(struct connman_network *network, network->connected = connected; + if (network->registered == FALSE) + 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); + if (connected == TRUE) { struct connman_element *element; enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN; @@ -550,6 +674,8 @@ int connman_network_set_connected(struct connman_network *network, __connman_device_increase_connections(network->device); + __connman_device_set_network(network->device, network); + element = connman_element_create(NULL); if (element != NULL) { element->type = type; @@ -562,6 +688,8 @@ int connman_network_set_connected(struct connman_network *network, } else { connman_element_unregister_children(&network->element); + __connman_device_set_network(network->device, NULL); + __connman_device_decrease_connections(network->device); } @@ -569,6 +697,60 @@ int connman_network_set_connected(struct connman_network *network, } /** + * connman_network_get_connected: + * @network: network structure + * + * Get network connection status + */ +connman_bool_t connman_network_get_connected(struct connman_network *network) +{ + return network->connected; +} + +/** + * connman_network_set_remember: + * @network: network structure + * @remember: remember state + * + * Change remember state of network (known networks) + */ +int connman_network_set_remember(struct connman_network *network, + connman_bool_t remember) +{ + DBusMessage *signal; + DBusMessageIter entry, value; + const char *key = "Remember"; + + DBG("network %p remember %d", network, remember); + + if (network->remember == remember) + return -EALREADY; + + network->remember = remember; + + if (network->registered == FALSE) + 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, &remember); + dbus_message_iter_close_container(&entry, &value); + + g_dbus_send_message(connection, signal); + + return 0; +} + +/** * connman_network_get_remember: * @network: network structure * @@ -598,6 +780,19 @@ int connman_network_connect(struct connman_network *network) return 0; } +int __connman_network_disconnect(struct connman_network *network) +{ + if (network->connected == FALSE) + return -ENOTCONN; + + if (network->driver && network->driver->disconnect) + return network->driver->disconnect(network); + + network->connected = FALSE; + + return 0; +} + /** * connman_network_set_string: * @network: network structure @@ -670,7 +865,9 @@ 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) { + 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); @@ -680,6 +877,26 @@ int connman_network_set_uint8(struct connman_network *network, } /** + * 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, "Priority") == TRUE) + return network->priority; + else if (g_str_equal(key, "Strength") == TRUE) + return network->strength; + + return 0; +} + +/** * connman_network_set_blob: * @network: network structure * @key: unique identifier @@ -842,12 +1059,20 @@ static struct connman_driver network_driver = { .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); @@ -879,6 +1104,11 @@ static int network_load(struct connman_network *network) 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); @@ -926,13 +1156,19 @@ 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, + if (network->priority > 0) + g_key_file_set_integer(keyfile, network->identifier, + "Priority", network->priority); + + 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); - if (network->wifi.passphrase != NULL) - g_key_file_set_string(keyfile, network->identifier, + 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); @@ -951,6 +1187,7 @@ done: static struct connman_storage network_storage = { .name = "network", .priority = CONNMAN_STORAGE_PRIORITY_LOW, + .network_init = network_init, .network_load = network_load, .network_save = network_save, };