X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fnetwork.c;h=4a7b8f2d4f148d2e74857c009b64061730fa209e;hb=9f02a110ab06991b9bcce6ff1ff651c2069eb3ad;hp=6c17088ee8ef7b6f60de2135f2ec31e74c3baebe;hpb=186b6fa635e755c824756db8e483eb6c92cb3167;p=connman diff --git a/src/network.c b/src/network.c index 6c17088..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; @@ -56,6 +58,24 @@ struct connman_network { } wifi; }; +static const char *type2string(enum connman_network_type type) +{ + switch (type) { + case CONNMAN_NETWORK_TYPE_UNKNOWN: + case CONNMAN_NETWORK_TYPE_VENDOR: + break; + case CONNMAN_NETWORK_TYPE_WIFI: + return "wifi"; + case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: + case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: + return "bluetooth"; + case CONNMAN_NETWORK_TYPE_HSO: + return "cellular"; + } + + return NULL; +} + static DBusMessage *get_properties(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -65,6 +85,10 @@ static DBusMessage *get_properties(DBusConnection *conn, DBG("conn %p", conn); + if (__connman_security_check_privilege(msg, + CONNMAN_SECURITY_PRIVILEGE_PUBLIC) < 0) + return __connman_error_permission_denied(msg); + reply = dbus_message_new_method_return(msg); if (reply == NULL) return NULL; @@ -87,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); @@ -110,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); @@ -125,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); @@ -135,23 +169,47 @@ static DBusMessage *set_property(DBusConnection *conn, dbus_message_iter_next(&iter); dbus_message_iter_recurse(&iter, &value); - if (__connman_security_check_privileges(msg) < 0) + if (__connman_security_check_privilege(msg, + 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); @@ -167,10 +225,20 @@ static DBusMessage *do_connect(DBusConnection *conn, DBG("conn %p", conn); + if (__connman_security_check_privilege(msg, + CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0) + return __connman_error_permission_denied(msg); + if (network->connected == TRUE) 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); @@ -188,6 +256,10 @@ static DBusMessage *do_disconnect(DBusConnection *conn, DBG("conn %p", conn); + if (__connman_security_check_privilege(msg, + CONNMAN_SECURITY_PRIVILEGE_MODIFY) < 0) + return __connman_error_permission_denied(msg); + if (network->connected == FALSE) return __connman_error_failed(msg); @@ -218,8 +290,43 @@ static GDBusSignalTable network_signals[] = { static DBusConnection *connection; -static void emit_networks_signal(void) +static void append_networks(struct connman_device *device, + DBusMessageIter *entry) { + DBusMessageIter value, iter; + const char *key = "Networks"; + + dbus_message_iter_append_basic(entry, DBUS_TYPE_STRING, &key); + + dbus_message_iter_open_container(entry, DBUS_TYPE_VARIANT, + DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_OBJECT_PATH_AS_STRING, + &value); + + dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY, + DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter); + __connman_element_list((struct connman_element *) device, + CONNMAN_ELEMENT_TYPE_NETWORK, &iter); + dbus_message_iter_close_container(&value, &iter); + + dbus_message_iter_close_container(entry, &value); +} + +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(path, + CONNMAN_DEVICE_INTERFACE, "PropertyChanged"); + if (signal == NULL) + return; + + dbus_message_iter_init_append(signal, &entry); + + append_networks(device, &entry); + + g_dbus_send_message(connection, signal); } static int register_interface(struct connman_element *element) @@ -238,7 +345,7 @@ static int register_interface(struct connman_element *element) network->registered = TRUE; - emit_networks_signal(); + emit_networks_signal(network->device); return 0; } @@ -251,7 +358,7 @@ static void unregister_interface(struct connman_element *element) network->registered = FALSE; - emit_networks_signal(); + emit_networks_signal(network->device); g_dbus_unregister_interface(connection, element->path, CONNMAN_NETWORK_INTERFACE); @@ -334,6 +441,8 @@ struct connman_network *connman_network_create(const char *identifier, enum connman_network_type type) { struct connman_network *network; + connman_uint8_t strength = 0; + const char *str; DBG("identifier %s type %d", identifier, type); @@ -343,32 +452,22 @@ 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; - - switch (type) { - case CONNMAN_NETWORK_TYPE_UNKNOWN: - case CONNMAN_NETWORK_TYPE_VENDOR: - network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN; - break; - case CONNMAN_NETWORK_TYPE_WIFI: - network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_WIFI; - break; - case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN: - case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN: - network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH; - break; - case CONNMAN_NETWORK_TYPE_HSO: - network->element.subtype = CONNMAN_ELEMENT_SUBTYPE_CELLULAR; - break; - } network->element.network = network; network->element.destruct = network_destruct; + str = type2string(type); + if (str != NULL) + connman_element_set_static_property(&network->element, + "Type", DBUS_TYPE_STRING, &str); + + connman_element_set_static_property(&network->element, + "Strength", DBUS_TYPE_BYTE, &strength); + network->type = type; network->identifier = g_strdup(identifier); @@ -459,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 @@ -468,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) @@ -475,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; @@ -492,11 +674,12 @@ 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; - element->subtype = network->element.subtype; - element->index = network->element.index; + element->type = type; + element->index = network->element.index; if (connman_element_register(element, &network->element) < 0) @@ -505,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); } @@ -512,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 * @@ -541,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 @@ -613,8 +865,33 @@ 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); + } + + return 0; +} + +/** + * 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; } @@ -782,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); @@ -819,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); @@ -866,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); @@ -891,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, };