X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fnetwork.c;h=cf0586b87a47560f2a798ee5a83dbd52a8017412;hb=e76c122e6c313b881c019da638c243b0765bf06f;hp=d24489514ffaecf63dab69f67e49bed51fa6e28f;hpb=fd24c47b801a63ff9a16384adcf3c73f8e3a77d8;p=connman diff --git a/src/network.c b/src/network.c index d244895..cf0586b 100644 --- a/src/network.c +++ b/src/network.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2008 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2009 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -23,6 +23,9 @@ #include #endif +#include +#include + #include #include "connman.h" @@ -30,22 +33,69 @@ 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_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; + connman_bool_t registered; + struct connman_device *device; + + struct { + void *ssid; + int ssid_len; + char *mode; + unsigned short channel; + char *security; + char *passphrase; + } 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_WIMAX: + return "wimax"; + 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) { + struct connman_network *network = data; DBusMessage *reply; DBusMessageIter array, dict; 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; @@ -57,6 +107,55 @@ static DBusMessage *get_properties(DBusConnection *conn, DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict); + if (network->device) { + const char *path = connman_device_get_path(network->device); + if (path != NULL) + connman_dbus_dict_append_variant(&dict, "Device", + 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, "Connected", + DBUS_TYPE_BOOLEAN, &network->connected); + + 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, + network->wifi.ssid_len); + + if (network->wifi.mode != NULL) + 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 && + __connman_security_check_privilege(msg, + CONNMAN_SECURITY_PRIVILEGE_SECRET) == 0) + connman_dbus_dict_append_variant(&dict, "WiFi.Passphrase", + DBUS_TYPE_STRING, &network->wifi.passphrase); + dbus_message_iter_close_container(&array, &dict); return reply; @@ -65,8 +164,10 @@ static DBusMessage *get_properties(DBusConnection *conn, static DBusMessage *set_property(DBusConnection *conn, DBusMessage *msg, void *data) { + struct connman_network *network = data; DBusMessageIter iter, value; const char *name; + int type; DBG("conn %p", conn); @@ -77,25 +178,90 @@ 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, "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); + } + + __connman_storage_save_network(network); + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } static DBusMessage *do_connect(DBusConnection *conn, DBusMessage *msg, void *data) { + struct connman_network *network = data; + int err; + 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, 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, -err); + } else + network->connected = TRUE; + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } static DBusMessage *do_disconnect(DBusConnection *conn, DBusMessage *msg, void *data) { + struct connman_network *network = data; + int err; + 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, 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, -err); + } else + network->connected = FALSE; + return g_dbus_create_reply(msg, DBUS_TYPE_INVALID); } @@ -114,16 +280,50 @@ 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) { struct connman_network *network = element->network; - g_dbus_unregister_interface(connection, element->path, - CONNMAN_NETWORK_INTERFACE); + DBG("element %p name %s", element, element->name); if (g_dbus_register_interface(connection, element->path, CONNMAN_NETWORK_INTERFACE, @@ -133,19 +333,35 @@ static int register_interface(struct connman_element *element) return -EIO; } - emit_networks_signal(); + network->registered = TRUE; + + emit_networks_signal(network->device); return 0; } static void unregister_interface(struct connman_element *element) { - emit_networks_signal(); + struct connman_network * network = element->network; + + DBG("element %p name %s", element, element->name); + + network->registered = FALSE; + + emit_networks_signal(network->device); g_dbus_unregister_interface(connection, element->path, CONNMAN_NETWORK_INTERFACE); } +connman_bool_t __connman_network_has_driver(struct connman_network *network) +{ + if (network == NULL || network->driver == NULL) + return FALSE; + + return network->registered; +} + static GSList *driver_list = NULL; static gint compare_priority(gconstpointer a, gconstpointer b) @@ -193,6 +409,15 @@ static void network_destruct(struct connman_element *element) DBG("element %p name %s", element, element->name); + g_free(network->wifi.ssid); + g_free(network->wifi.mode); + 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); } @@ -208,6 +433,9 @@ 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; + char *temp; DBG("identifier %s type %d", identifier, type); @@ -217,16 +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; - network->type = type; + str = type2string(type); + if (str != NULL) + connman_element_set_string(&network->element, "Type", str); + + connman_element_set_uint8(&network->element, "Strength", strength); + + network->type = type; + network->secondary = FALSE; network->identifier = g_strdup(identifier); return network; @@ -257,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 @@ -268,6 +525,604 @@ const char *connman_network_get_identifier(struct connman_network *network) return network->identifier; } +/** + * connman_network_get_path: + * @network: network structure + * + * Get path name of network + */ +const char *connman_network_get_path(struct connman_network *network) +{ + return network->element.path; +} + +/** + * connman_network_set_index: + * @network: network structure + * @index: index number + * + * Set index number of network + */ +void connman_network_set_index(struct connman_network *network, int index) +{ + network->element.index = index; +} + +/** + * connman_network_get_index: + * @network: network structure + * + * Get index number of network + */ +int connman_network_get_index(struct connman_network *network) +{ + return network->element.index; +} + +/** + * connman_network_set_protocol: + * @network: network structure + * @protocol: network protocol + * + * Change protocol of network + */ +void connman_network_set_protocol(struct connman_network *network, + enum connman_network_protocol protocol) +{ + network->protocol = protocol; +} + +/** + * 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) +{ + if (network->secondary == TRUE) + return; + + 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->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 (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; + + switch (network->protocol) { + case CONNMAN_NETWORK_PROTOCOL_UNKNOWN: + return 0; + case CONNMAN_NETWORK_PROTOCOL_IP: + type = CONNMAN_ELEMENT_TYPE_DHCP; + break; + case CONNMAN_NETWORK_PROTOCOL_PPP: + type = CONNMAN_ELEMENT_TYPE_PPP; + break; + } + + __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; + element->index = network->element.index; + + 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_connected: + * @network: network structure + * + * Get network connection status + */ +connman_bool_t connman_network_get_connected(struct connman_network *network) +{ + return network->connected; +} + +/** + * __connman_network_connect: + * @network: network structure + * + * Connect network + */ +int __connman_network_connect(struct connman_network *network) +{ + int err; + + DBG("network %p", network); + + if (network->connected == TRUE) + return -EALREADY; + + if (network->driver == NULL) + return -EUNATCH; + + if (network->driver->connect == NULL) + return -ENOSYS; + + __connman_device_disconnect(network->device); + + 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); +} + +/** + * connman_network_set_string: + * @network: network structure + * @key: unique identifier + * @value: string value + * + * Set string value for specific key + */ +int connman_network_set_string(struct connman_network *network, + const char *key, const char *value) +{ + DBG("network %p key %s value %s", network, key, 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); + } else if (g_str_equal(key, "WiFi.Mode") == TRUE) { + g_free(network->wifi.mode); + network->wifi.mode = g_strdup(value); + } else if (g_str_equal(key, "WiFi.Security") == TRUE) { + g_free(network->wifi.security); + network->wifi.security = g_strdup(value); + } else if (g_str_equal(key, "WiFi.Passphrase") == TRUE) { + g_free(network->wifi.passphrase); + network->wifi.passphrase = g_strdup(value); + } + + return connman_element_set_string(&network->element, key, value); +} + +/** + * connman_network_get_string: + * @network: network structure + * @key: unique identifier + * + * Get string value for specific key + */ +const char *connman_network_get_string(struct connman_network *network, + const char *key) +{ + DBG("network %p key %s", network, key); + + 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; + else if (g_str_equal(key, "WiFi.Mode") == TRUE) + return network->wifi.mode; + else if (g_str_equal(key, "WiFi.Security") == TRUE) + return network->wifi.security; + else if (g_str_equal(key, "WiFi.Passphrase") == TRUE) + return network->wifi.passphrase; + + return connman_element_get_string(&network->element, key); +} + +/** + * connman_network_set_uint8: + * @network: network structure + * @key: unique identifier + * @value: integer value + * + * Set integer value for specific key + */ +int connman_network_set_uint8(struct connman_network *network, + const char *key, connman_uint8_t value) +{ + DBG("network %p key %s value %d", network, key, 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; +} + +/** + * connman_network_set_blob: + * @network: network structure + * @key: unique identifier + * @data: blob data + * @size: blob size + * + * Set binary blob value for specific key + */ +int connman_network_set_blob(struct connman_network *network, + const char *key, const void *data, unsigned int size) +{ + 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); + if (network->wifi.ssid != NULL) { + memcpy(network->wifi.ssid, data, size); + network->wifi.ssid_len = size; + } else + network->wifi.ssid_len = 0; + } + + return connman_element_set_blob(&network->element, key, data, size); +} + +/** + * connman_network_get_blob: + * @network: network structure + * @key: unique identifier + * @size: pointer to blob size + * + * Get binary blob value for specific key + */ +const void *connman_network_get_blob(struct connman_network *network, + const char *key, unsigned int *size) +{ + DBG("network %p key %s", network, key); + + if (g_str_equal(key, "WiFi.SSID") == TRUE) { + if (size != NULL) + *size = network->wifi.ssid_len; + return network->wifi.ssid; + } + + return connman_element_get_blob(&network->element, key, size); +} + void __connman_network_set_device(struct connman_network *network, struct connman_device *device) { @@ -343,7 +1198,7 @@ static int network_probe(struct connman_element *element) } } - if (!network->driver) + if (network->driver == NULL) return -ENODEV; err = register_interface(element); @@ -353,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; } @@ -365,21 +1236,67 @@ static void network_remove(struct connman_element *element) if (network == NULL) return; - if (!network->driver) + 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 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, }; int __connman_network_init(void)