*
* 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
#include <config.h>
#endif
+#include <string.h>
+
#include <gdbus.h>
#include "connman.h"
struct connman_network {
struct connman_element element;
enum connman_network_type type;
+ enum connman_network_protocol protocol;
+ connman_bool_t connected;
+ connman_uint8_t strength;
char *identifier;
+ char *name;
char *path;
struct connman_network_driver *driver;
void *driver_data;
struct connman_device *device;
+
+ struct {
+ void *ssid;
+ int ssid_len;
+ char *mode;
+ char *security;
+ char *passphrase;
+ } wifi;
};
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->identifier != NULL)
+ if (network->name != NULL)
connman_dbus_dict_append_variant(&dict, "Name",
- DBUS_TYPE_STRING, &network->identifier);
+ 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->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.security != NULL)
+ connman_dbus_dict_append_variant(&dict, "WiFi.Security",
+ DBUS_TYPE_STRING, &network->wifi.security);
+
+ if (network->wifi.passphrase != NULL)
+ connman_dbus_dict_append_variant(&dict, "WiFi.Passphrase",
+ DBUS_TYPE_STRING, &network->wifi.passphrase);
dbus_message_iter_close_container(&array, &dict);
DBG("element %p name %s", element, element->name);
- g_dbus_unregister_interface(connection, element->path,
- CONNMAN_NETWORK_INTERFACE);
-
if (g_dbus_register_interface(connection, element->path,
CONNMAN_NETWORK_INTERFACE,
network_methods, network_signals,
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->path);
+ g_free(network->name);
g_free(network->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;
return network->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_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)
+{
+ DBG("network %p connected %d", network, connected);
+
+ if (network->connected == connected)
+ return -EALREADY;
+
+ network->connected = connected;
+
+ if (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;
+ }
+
+ element = connman_element_create(NULL);
+ if (element != NULL) {
+ element->type = type;
+ element->subtype = network->element.subtype;
+ element->index = network->element.index;
+
+ if (connman_element_register(element,
+ &network->element) < 0)
+ connman_element_unref(element);
+ }
+ } else
+ connman_element_unregister_children(&network->element);
+
+ return 0;
+}
+
+/**
+ * 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_str_equal(key, "Name") == TRUE) {
+ g_free(network->name);
+ network->name = 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);
+ }
+
+ return 0;
+}
+
+/**
+ * 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_str_equal(key, "Strength") == TRUE)
+ network->strength = value;
+
+ 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_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 0;
+}
+
void __connman_network_set_device(struct connman_network *network,
struct connman_device *device)
{
.remove = network_remove,
};
+static int network_load(struct connman_network *network)
+{
+ DBG("network %p", network);
+
+ return 0;
+}
+
+static int network_save(struct connman_network *network)
+{
+ DBG("network %p", network);
+
+ return 0;
+}
+
+static struct connman_storage network_storage = {
+ .name = "network",
+ .priority = CONNMAN_STORAGE_PRIORITY_LOW,
+ .network_load = network_load,
+ .network_save = network_save,
+};
+
int __connman_network_init(void)
{
DBG("");
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);
}
connman_driver_unregister(&network_driver);
+ connman_storage_unregister(&network_storage);
+
dbus_connection_unref(connection);
}
projects / connman / blobdiff