#include <errno.h>
#include <stdarg.h>
+#include <string.h>
#include <glib.h>
#include <gdbus.h>
return "unknown";
case CONNMAN_ELEMENT_TYPE_ROOT:
return "root";
+ case CONNMAN_ELEMENT_TYPE_PROFILE:
+ return "profile";
case CONNMAN_ELEMENT_TYPE_DEVICE:
return "device";
case CONNMAN_ELEMENT_TYPE_NETWORK:
switch (type) {
case CONNMAN_ELEMENT_SUBTYPE_UNKNOWN:
return "unknown";
+ case CONNMAN_ELEMENT_SUBTYPE_FAKE:
+ return "fake";
case CONNMAN_ELEMENT_SUBTYPE_NETWORK:
return "network";
case CONNMAN_ELEMENT_SUBTYPE_ETHERNET:
return NULL;
}
+static void append_array(DBusMessageIter *dict,
+ const char *key, int type, void *val, int len)
+{
+ DBusMessageIter entry, value, array;
+ const char *variant_sig, *array_sig;
+
+ switch (type) {
+ case DBUS_TYPE_BYTE:
+ variant_sig = DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING;
+ array_sig = DBUS_TYPE_BYTE_AS_STRING;
+ break;
+ default:
+ return;
+ }
+
+ dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
+
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+ dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+ variant_sig, &value);
+
+ dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
+ array_sig, &array);
+ dbus_message_iter_append_fixed_array(&array, type, val, len);
+ dbus_message_iter_close_container(&value, &array);
+
+ dbus_message_iter_close_container(&entry, &value);
+
+ dbus_message_iter_close_container(dict, &entry);
+}
+
static void append_entry(DBusMessageIter *dict,
const char *key, int type, void *val)
{
if (property->value == NULL)
return;
- append_entry(dict, property->name, property->type, &property->value);
+ if (property->type == DBUS_TYPE_ARRAY)
+ append_array(dict, property->name, property->subtype,
+ &property->value, property->size);
+ else
+ append_entry(dict, property->name, property->type,
+ &property->value);
}
static DBusMessage *get_properties(DBusConnection *conn,
append_entry(&dict, "Priority",
DBUS_TYPE_UINT16, &element->priority);
- if (element->network.identifier != NULL)
- append_entry(&dict, "Identifier",
- DBUS_TYPE_STRING, &element->network.identifier);
-
if (element->ipv4.address != NULL)
append_entry(&dict, "IPv4.Address",
DBUS_TYPE_STRING, &element->ipv4.address);
DBG("conn %p", conn);
- if (element->driver == NULL)
+ if (element->enabled == FALSE)
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
- if (element->driver->update) {
+ if (element->driver && element->driver->update) {
DBG("Calling update callback");
element->driver->update(element);
}
DBG("conn %p", conn);
- if (element->driver == NULL)
+ if (element->enabled == TRUE)
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
- if (element->driver->enable) {
+ if (element->driver && element->driver->enable) {
DBG("Calling enable callback");
- element->driver->enable(element);
+ if (element->driver->enable(element) < 0)
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
+ element->enabled = TRUE;
+
+ g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
+ DBUS_TYPE_OBJECT_PATH, &element->path,
+ DBUS_TYPE_INVALID);
+
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
DBG("conn %p", conn);
- if (element->driver == NULL)
+ if (element->enabled == FALSE)
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
- if (element->driver->disable) {
+ if (element->driver && element->driver->disable) {
DBG("Calling disable callback");
- element->driver->disable(element);
+ if (element->driver->disable(element) < 0)
+ return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
+ element->enabled = FALSE;
+
+ g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
+ DBUS_TYPE_OBJECT_PATH, &element->path,
+ DBUS_TYPE_INVALID);
+
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
return FALSE;
}
+void __connman_driver_rescan(struct connman_driver *driver)
+{
+ DBG("driver %p name %s", driver, driver->name);
+
+ if (!driver->probe)
+ return;
+
+ g_static_rw_lock_writer_lock(&element_lock);
+
+ if (element_root != NULL)
+ g_node_traverse(element_root, G_PRE_ORDER,
+ G_TRAVERSE_ALL, -1, probe_driver, driver);
+
+ g_static_rw_lock_writer_unlock(&element_lock);
+}
+
/**
* connman_driver_register:
* @driver: driver definition
if (!(property->flags & CONNMAN_PROPERTY_FLAG_REFERENCE)) {
if (property->type == DBUS_TYPE_STRING)
g_free(property->value);
+ if (property->type == DBUS_TYPE_ARRAY &&
+ property->subtype == DBUS_TYPE_BYTE)
+ g_free(property->value);
}
g_free(property);
g_free(element->ipv4.network);
g_free(element->ipv4.broadcast);
g_free(element->ipv4.nameserver);
- g_free(element->network.identifier);
g_free(element->path);
g_free(element->name);
g_free(element);
return 0;
}
+int connman_element_add_static_array_property(struct connman_element *element,
+ const char *name, int type, const void *value, int len)
+{
+ struct connman_property *property;
+
+ DBG("element %p name %s", element, element->name);
+
+ if (type != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ property = g_try_new0(struct connman_property, 1);
+ if (property == NULL)
+ return -ENOMEM;
+
+ property->flags = CONNMAN_PROPERTY_FLAG_STATIC;
+ property->id = CONNMAN_PROPERTY_ID_INVALID;
+ property->name = g_strdup(name);
+ property->type = DBUS_TYPE_ARRAY;
+ property->subtype = type;
+
+ DBG("name %s type %d value %p", name, type, value);
+
+ switch (type) {
+ case DBUS_TYPE_BYTE:
+ property->value = g_try_malloc(len);
+ if (property->value != NULL) {
+ memcpy(property->value,
+ *((const unsigned char **) value), len);
+ property->size = len;
+ }
+ break;
+ }
+
+ connman_element_lock(element);
+ element->properties = g_slist_append(element->properties, property);
+ connman_element_unlock(element);
+
+ return 0;
+}
+
static void *get_reference_value(struct connman_element *element,
enum connman_property_id id)
{
int connman_element_set_property(struct connman_element *element,
enum connman_property_id id, const void *value)
{
-#if 0
- switch (type) {
- case CONNMAN_PROPERTY_TYPE_INVALID:
- return -EINVAL;
- case CONNMAN_PROPERTY_TYPE_IPV4_ADDRESS:
+ switch (id) {
+ case CONNMAN_PROPERTY_ID_IPV4_ADDRESS:
connman_element_lock(element);
g_free(element->ipv4.address);
element->ipv4.address = g_strdup(*((const char **) value));
connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_TYPE_IPV4_NETMASK:
+ case CONNMAN_PROPERTY_ID_IPV4_NETMASK:
connman_element_lock(element);
g_free(element->ipv4.netmask);
element->ipv4.netmask = g_strdup(*((const char **) value));
connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_TYPE_IPV4_GATEWAY:
+ case CONNMAN_PROPERTY_ID_IPV4_GATEWAY:
connman_element_lock(element);
g_free(element->ipv4.gateway);
element->ipv4.gateway = g_strdup(*((const char **) value));
connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_TYPE_IPV4_NAMESERVER:
+ case CONNMAN_PROPERTY_ID_IPV4_NAMESERVER:
connman_element_lock(element);
g_free(element->ipv4.nameserver);
element->ipv4.nameserver = g_strdup(*((const char **) value));
connman_element_unlock(element);
break;
+ default:
+ return -EINVAL;
}
-#endif
g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
if (element->type == CONNMAN_ELEMENT_TYPE_ROOT)
return -EINVAL;
-#if 0
- switch (type) {
- case CONNMAN_PROPERTY_TYPE_INVALID:
- return -EINVAL;
- case CONNMAN_PROPERTY_TYPE_IPV4_ADDRESS:
+ switch (id) {
+ case CONNMAN_PROPERTY_ID_IPV4_ADDRESS:
if (element->ipv4.address == NULL)
return connman_element_get_value(element->parent,
- type, value);
+ id, value);
connman_element_lock(element);
*((char **) value) = element->ipv4.address;
connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_TYPE_IPV4_NETMASK:
+ case CONNMAN_PROPERTY_ID_IPV4_NETMASK:
if (element->ipv4.netmask == NULL)
return connman_element_get_value(element->parent,
- type, value);
+ id, value);
connman_element_lock(element);
*((char **) value) = element->ipv4.netmask;
connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_TYPE_IPV4_GATEWAY:
+ case CONNMAN_PROPERTY_ID_IPV4_GATEWAY:
if (element->ipv4.gateway == NULL)
return connman_element_get_value(element->parent,
- type, value);
+ id, value);
connman_element_lock(element);
*((char **) value) = element->ipv4.gateway;
connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_TYPE_IPV4_NAMESERVER:
+ case CONNMAN_PROPERTY_ID_IPV4_NAMESERVER:
if (element->ipv4.nameserver == NULL)
return connman_element_get_value(element->parent,
- type, value);
+ id, value);
connman_element_lock(element);
*((char **) value) = element->ipv4.nameserver;
connman_element_unlock(element);
break;
+ default:
+ return -EINVAL;
}
-#endif
return 0;
}
+gboolean connman_element_get_static_property(struct connman_element *element,
+ const char *name, void *value)
+{
+ GSList *list;
+ gboolean found = FALSE;
+
+ DBG("element %p name %s", element, element->name);
+
+ connman_element_lock(element);
+
+ for (list = element->properties; list; list = list->next) {
+ struct connman_property *property = list->data;
+
+ if (!(property->flags & CONNMAN_PROPERTY_FLAG_STATIC))
+ continue;
+
+ if (g_str_equal(property->name, name) == TRUE) {
+ *((char **) value) = property->value;
+ found = TRUE;
+ break;
+ }
+ }
+
+ connman_element_unlock(element);
+
+ return found;
+}
+
+gboolean connman_element_get_static_array_property(struct connman_element *element,
+ const char *name, void *value, int *len)
+{
+ GSList *list;
+ gboolean found = FALSE;
+
+ DBG("element %p name %s", element, element->name);
+
+ connman_element_lock(element);
+
+ for (list = element->properties; list; list = list->next) {
+ struct connman_property *property = list->data;
+
+ if (!(property->flags & CONNMAN_PROPERTY_FLAG_STATIC))
+ continue;
+
+ if (g_str_equal(property->name, name) == TRUE) {
+ *((char **) value) = property->value;
+ *len = property->size;
+ found = TRUE;
+ break;
+ }
+ }
+
+ connman_element_unlock(element);
+
+ return found;
+}
+
+gboolean connman_element_match_static_property(struct connman_element *element,
+ const char *name, const void *value)
+{
+ GSList *list;
+ gboolean result = FALSE;
+
+ DBG("element %p name %s", element, element->name);
+
+ connman_element_lock(element);
+
+ for (list = element->properties; list; list = list->next) {
+ struct connman_property *property = list->data;
+
+ if (!(property->flags & CONNMAN_PROPERTY_FLAG_STATIC))
+ continue;
+
+ if (g_str_equal(property->name, name) == FALSE)
+ continue;
+
+ if (property->type == DBUS_TYPE_STRING)
+ result = g_str_equal(property->value,
+ *((const char **) value));
+
+ if (result == TRUE)
+ break;
+ }
+
+ connman_element_unlock(element);
+
+ return result;
+}
+
/**
* connman_element_register:
* @element: the element to register
DBG("element %p name %s parent %p", element, element->name, parent);
if (device_filter && element->type == CONNMAN_ELEMENT_TYPE_DEVICE) {
- if (g_str_equal(device_filter, element->name) == FALSE) {
+ if (g_pattern_match_simple(device_filter,
+ element->name) == FALSE) {
DBG("ignoring %s device", element->name);
return -EPERM;
}
g_static_rw_lock_reader_unlock(&element_lock);
}
+int connman_element_set_enabled(struct connman_element *element,
+ gboolean enabled)
+{
+ if (element->enabled == enabled)
+ return 0;
+
+ element->enabled = enabled;
+
+ connman_element_update(element);
+
+ return 0;
+}
+
static void register_element(gpointer data, gpointer user_data)
{
struct connman_element *element = data;
thread_unregister_children = g_thread_pool_new(unregister_children,
NULL, 1, FALSE, NULL);
+ __connman_device_init();
+
return 0;
}
{
DBG("");
+ __connman_device_cleanup();
+
g_thread_pool_free(thread_register, TRUE, TRUE);
thread_register = NULL;
projects / connman / blobdiff