#include <config.h>
#endif
+#include <string.h>
+
#include <gdbus.h>
#include "connman.h"
struct connman_element element;
enum connman_network_type type;
enum connman_network_protocol protocol;
- gboolean connected;
+ connman_bool_t connected;
+ connman_bool_t remember;
+ connman_uint8_t strength;
char *identifier;
- char *path;
+ char *name;
+ char *node;
struct connman_network_driver *driver;
void *driver_data;
+ connman_bool_t registered;
+
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->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->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);
+ connman_dbus_dict_append_variant(&dict, "Remember",
+ DBUS_TYPE_BOOLEAN, &network->remember);
+
+ 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);
return reply;
static DBusMessage *set_property(DBusConnection *conn,
DBusMessage *msg, void *data)
{
+ struct connman_network *network = data;
DBusMessageIter iter, value;
const char *name;
if (__connman_security_check_privileges(msg) < 0)
return __connman_error_permission_denied(msg);
+ if (g_str_equal(name, "Remember") == TRUE) {
+ connman_bool_t remember;
+
+ dbus_message_iter_get_basic(&value, &remember);
+
+ if (network->remember == remember)
+ return __connman_error_invalid_arguments(msg);
+ } else if (g_str_equal(name, "WiFi.Passphrase") == TRUE) {
+ const char *passphrase;
+
+ dbus_message_iter_get_basic(&value, &passphrase);
+
+ g_free(network->wifi.passphrase);
+ network->wifi.passphrase = g_strdup(passphrase);
+ }
+
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
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,
return -EIO;
}
+ network->registered = TRUE;
+
emit_networks_signal();
return 0;
static void unregister_interface(struct connman_element *element)
{
+ struct connman_network * network = element->network;
+
DBG("element %p name %s", element, element->name);
+ network->registered = FALSE;
+
emit_networks_signal();
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)
DBG("element %p name %s", element, element->name);
- g_free(network->path);
+ g_free(network->wifi.ssid);
+ g_free(network->wifi.mode);
+ g_free(network->wifi.security);
+ g_free(network->wifi.passphrase);
+
+ g_free(network->node);
+ g_free(network->name);
g_free(network->identifier);
}
}
/**
- * connman_network_set_path:
- * @network: network structure
- * @path: path name
- *
- * Set path name of network
- */
-void connman_network_set_path(struct connman_network *network, const char *path)
-{
- g_free(network->element.devpath);
- network->element.devpath = g_strdup(path);
-
- g_free(network->path);
- network->path = g_strdup(path);
-}
-
-/**
* connman_network_get_path:
* @network: network structure
*
*/
const char *connman_network_get_path(struct connman_network *network)
{
- return network->path;
+ return network->element.path;
}
/**
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, "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);
+ }
+
+ return 0;
+}
+
+/**
+ * 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);
+
+ 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;
+
+ return NULL;
+}
+
+/**
+ * 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)
{
projects / connman / blobdiff