DBUS_TYPE_STRING, "IPv4.Broadcast" },
{ CONNMAN_PROPERTY_ID_IPV4_NAMESERVER,
DBUS_TYPE_STRING, "IPv4.Nameserver" },
-
- { CONNMAN_PROPERTY_ID_WIFI_SECURITY,
- DBUS_TYPE_STRING, "WiFi.Security" },
- { CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE,
- DBUS_TYPE_STRING, "WiFi.Passphrase" },
-
{ }
};
return NULL;
}
-static const char *subtype2string(enum connman_element_subtype type)
-{
- switch (type) {
- case CONNMAN_ELEMENT_SUBTYPE_UNKNOWN:
- return "unknown";
- case CONNMAN_ELEMENT_SUBTYPE_FAKE:
- return "fake";
- case CONNMAN_ELEMENT_SUBTYPE_ETHERNET:
- return "ethernet";
- case CONNMAN_ELEMENT_SUBTYPE_WIFI:
- return "wifi";
- case CONNMAN_ELEMENT_SUBTYPE_WIMAX:
- return "wimax";
- case CONNMAN_ELEMENT_SUBTYPE_CELLULAR:
- return "cellular";
- case CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH:
- return "bluetooth";
- }
-
- return NULL;
-}
-
-const char *__connman_element_policy2string(enum connman_element_policy policy)
-{
- switch (policy) {
- case CONNMAN_ELEMENT_POLICY_UNKNOWN:
- return "unknown";
- case CONNMAN_ELEMENT_POLICY_IGNORE:
- return "ignore";
- case CONNMAN_ELEMENT_POLICY_AUTO:
- return "auto";
- case CONNMAN_ELEMENT_POLICY_ASK:
- return "ask";
- }
-
- return NULL;
-}
-
-enum connman_element_policy __connman_element_string2policy(const char *policy)
-{
- if (strcasecmp(policy, "ignore") == 0)
- return CONNMAN_ELEMENT_POLICY_IGNORE;
- else if (strcasecmp(policy, "auto") == 0)
- return CONNMAN_ELEMENT_POLICY_AUTO;
- else if (strcasecmp(policy, "ask") == 0)
- return CONNMAN_ELEMENT_POLICY_ASK;
- else
- return CONNMAN_ELEMENT_POLICY_UNKNOWN;
-}
-
const char *__connman_ipv4_method2string(enum connman_ipv4_method method)
{
switch (method) {
return CONNMAN_IPV4_METHOD_UNKNOWN;
}
+#if 0
static void append_property(DBusMessageIter *dict,
struct connman_property *property)
{
__connman_element_unlock(element);
}
-#if 0
static void set_common_property(struct connman_element *element,
const char *name, DBusMessageIter *value)
{
g_dbus_send_message(conn, signal);
}
-static void emit_enabled_signal(DBusConnection *conn,
- struct connman_element *element)
-{
- DBusMessage *signal;
- DBusMessageIter entry, value;
- const char *iface, *key;
-
- DBG("conn %p", conn);
-
- if (element == NULL)
- return;
-
- switch (element->type) {
- case CONNMAN_ELEMENT_TYPE_CONNECTION:
- iface = CONNMAN_CONNECTION_INTERFACE;
- key = "Default";
- break;
- default:
- return;
- }
-
- signal = dbus_message_new_signal(element->path,
- iface, "PropertyChanged");
- if (signal == NULL)
- return;
-
- 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,
- &element->enabled);
- dbus_message_iter_close_container(&entry, &value);
-
- g_dbus_send_message(conn, signal);
-}
-
-static DBusMessage *do_enable(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
-
- DBG("conn %p", conn);
-
- if (element->enabled == TRUE)
- return __connman_error_failed(msg);
-
- if (element->driver && element->driver->enable) {
- DBG("Calling enable callback");
- if (element->driver->enable(element) < 0)
- return __connman_error_failed(msg);
- }
-
- element->enabled = TRUE;
-
- emit_enabled_signal(connection, element);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *do_disable(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
-
- DBG("conn %p", conn);
-
- if (element->enabled == FALSE)
- return __connman_error_failed(msg);
-
- if (element->driver && element->driver->disable) {
- DBG("Calling disable callback");
- if (element->driver->disable(element) < 0)
- return __connman_error_failed(msg);
- }
-
- element->enabled = FALSE;
-
- emit_enabled_signal(connection, element);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *connection_get_properties(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
- DBusMessage *reply;
- DBusMessageIter array, dict;
- const char *str;
-
- DBG("conn %p", conn);
-
- reply = dbus_message_new_method_return(msg);
- if (reply == NULL)
- return NULL;
-
- dbus_message_iter_init_append(reply, &array);
-
- dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
- DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
- DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
- DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
-
- str = subtype2string(element->subtype);
- if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Type",
- DBUS_TYPE_STRING, &str);
-
- if (element->devname != NULL)
- connman_dbus_dict_append_variant(&dict, "Interface",
- DBUS_TYPE_STRING, &element->devname);
-
- if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIFI ||
- element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIMAX)
- connman_dbus_dict_append_variant(&dict, "Strength",
- DBUS_TYPE_BYTE, &element->strength);
-
- connman_dbus_dict_append_variant(&dict, "Default",
- DBUS_TYPE_BOOLEAN, &element->enabled);
-
- add_common_properties(element, &dict);
-
- dbus_message_iter_close_container(&array, &dict);
-
- return reply;
-}
-
-static DBusMessage *connection_set_property(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
- DBusMessageIter iter, value;
- const char *name;
-
- DBG("conn %p", conn);
-
- if (dbus_message_iter_init(msg, &iter) == FALSE)
- return __connman_error_invalid_arguments(msg);
-
- dbus_message_iter_get_basic(&iter, &name);
- dbus_message_iter_next(&iter);
- dbus_message_iter_recurse(&iter, &value);
-
- if (__connman_security_check_privileges(msg) < 0)
- return __connman_error_permission_denied(msg);
-
- if (g_str_equal(name, "Default") == TRUE) {
- dbus_bool_t enabled;
-
- dbus_message_iter_get_basic(&value, &enabled);
-
- if (enabled == TRUE)
- return do_enable(conn, msg, element);
- else
- return do_disable(conn, msg, element);
- }
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static GDBusMethodTable connection_methods[] = {
- { "GetProperties", "", "a{sv}", connection_get_properties },
- { "SetProperty", "sv", "", connection_set_property },
- { },
-};
-
-static GDBusSignalTable element_signals[] = {
- { "PropertyChanged", "sv" },
- { },
-};
-
struct foreach_data {
enum connman_element_type type;
element_cb_t callback;
if (element->type == CONNMAN_ELEMENT_TYPE_ROOT)
return FALSE;
- if (element->type != driver->type &&
- driver->type != CONNMAN_ELEMENT_TYPE_UNKNOWN)
- return FALSE;
-
- if (element->subtype == driver->subtype ||
- driver->subtype == CONNMAN_ELEMENT_SUBTYPE_UNKNOWN)
+ if (element->type == driver->type ||
+ driver->type == CONNMAN_ELEMENT_TYPE_UNKNOWN)
return TRUE;
return FALSE;
}
-static void enable_element(struct connman_element *element)
-{
- if (element->type != CONNMAN_ELEMENT_TYPE_DEVICE)
- return;
-
- if (element->policy != CONNMAN_ELEMENT_POLICY_AUTO)
- return;
-
- if (element->driver && element->driver->enable) {
- if (element->driver->enable(element) == 0) {
- element->enabled = TRUE;
- emit_enabled_signal(connection, element);
- }
- }
-}
-
static gboolean probe_driver(GNode *node, gpointer data)
{
struct connman_element *element = node->data;
__connman_element_lock(element);
element->driver = driver;
__connman_element_unlock(element);
-
- enable_element(element);
}
return FALSE;
return 0;
}
-static void disable_element(struct connman_element *element)
-{
- if (element->policy != CONNMAN_ELEMENT_POLICY_AUTO)
- return;
-
- if (element->enabled == FALSE)
- return;
-
- if (element->driver && element->driver->disable) {
- if (element->driver->disable(element) == 0) {
- element->enabled = FALSE;
- emit_enabled_signal(connection, element);
- }
- }
-}
-
static gboolean remove_driver(GNode *node, gpointer data)
{
struct connman_element *element = node->data;
DBG("element %p name %s", element, element->name);
if (element->driver == driver) {
- disable_element(element);
-
if (driver->remove)
driver->remove(element);
element->name = g_strdup(name);
element->type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
- element->subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN;
- element->state = CONNMAN_ELEMENT_STATE_CLOSED;
- element->policy = CONNMAN_ELEMENT_POLICY_AUTO;
element->index = -1;
element->enabled = FALSE;
g_free(element->ipv4.broadcast);
g_free(element->ipv4.nameserver);
g_free(element->devname);
- g_free(element->devpath);
g_free(element->path);
g_free(element->name);
g_free(element);
return 0;
}
-static void emit_property_changed(DBusConnection *conn,
- struct connman_element *element,
- const char *name, int type, const void *data)
-{
- DBusMessage *signal;
- DBusMessageIter entry, value;
- const char *iface, *sig;
-
- DBG("conn %p", conn);
-
- switch (element->type) {
- case CONNMAN_ELEMENT_TYPE_CONNECTION:
- iface = CONNMAN_CONNECTION_INTERFACE;
- break;
- default:
- return;
- }
-
- signal = dbus_message_new_signal(element->path,
- iface, "PropertyChanged");
- if (signal == NULL)
- return;
-
- dbus_message_iter_init_append(signal, &entry);
-
- dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &name);
-
- switch (type) {
- case DBUS_TYPE_STRING:
- sig = DBUS_TYPE_STRING_AS_STRING;
- break;
- case DBUS_TYPE_BYTE:
- sig = DBUS_TYPE_BYTE_AS_STRING;
- break;
- default:
- sig = DBUS_TYPE_VARIANT_AS_STRING;
- break;
- }
-
- dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
- sig, &value);
- dbus_message_iter_append_basic(&value, type, data);
- dbus_message_iter_close_container(&entry, &value);
-
- g_dbus_send_message(conn, signal);
-}
-
int connman_element_set_static_property(struct connman_element *element,
const char *name, int type, const void *value)
{
__connman_element_unlock(element);
- emit_property_changed(connection, element, name, type, value);
-
return 0;
}
element->ipv4.nameserver = g_strdup(*((const char **) value));
__connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_ID_WIFI_SECURITY:
- __connman_element_lock(element);
- g_free(element->wifi.security);
- element->wifi.security = g_strdup(*((const char **) value));
- __connman_element_unlock(element);
- break;
- case CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE:
- __connman_element_lock(element);
- g_free(element->wifi.passphrase);
- element->wifi.passphrase = g_strdup(*((const char **) value));
- __connman_element_unlock(element);
- break;
default:
return -EINVAL;
}
return -EINVAL;
switch (id) {
+ case CONNMAN_PROPERTY_ID_IPV4_METHOD:
+ if (element->ipv4.method == CONNMAN_IPV4_METHOD_UNKNOWN)
+ return connman_element_get_value(element->parent,
+ id, value);
+ __connman_element_lock(element);
+ *((const char **) value) = __connman_ipv4_method2string(element->ipv4.method);
+ __connman_element_unlock(element);
+ break;
case CONNMAN_PROPERTY_ID_IPV4_ADDRESS:
if (element->ipv4.address == NULL)
return connman_element_get_value(element->parent,
*((char **) value) = element->ipv4.nameserver;
__connman_element_unlock(element);
break;
- case CONNMAN_PROPERTY_ID_WIFI_SECURITY:
- if (element->wifi.security == NULL)
- return connman_element_get_value(element->parent,
- id, value);
- __connman_element_lock(element);
- *((char **) value) = element->wifi.security;
- __connman_element_unlock(element);
- break;
- case CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE:
- if (element->wifi.passphrase == NULL)
- return connman_element_get_value(element->parent,
- id, value);
- __connman_element_lock(element);
- *((char **) value) = element->wifi.passphrase;
- __connman_element_unlock(element);
- break;
default:
return -EINVAL;
}
*((char **) value) = property->value;
found = TRUE;
break;
+ case DBUS_TYPE_BYTE:
+ memcpy(value, property->value, 1);
+ found = TRUE;
+ break;
}
break;
}
__connman_element_unlock(element);
+ if (found == FALSE && element->parent != NULL)
+ return connman_element_get_static_property(element->parent,
+ name, value);
+
return found;
}
g_dbus_send_message(conn, signal);
}
-static void set_signal_strength(struct connman_element *connection)
-{
- struct connman_element *element = connection;
-
- while (element != NULL) {
- if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK) {
- connection->strength = element->strength;
- break;
- }
-
- element = element->parent;
- }
-}
-
static void probe_element(struct connman_element *element)
{
GSList *list;
__connman_element_lock(element);
element->driver = driver;
__connman_element_unlock(element);
-
- enable_element(element);
break;
}
}
node = g_node_find(element_root, G_PRE_ORDER,
G_TRAVERSE_ALL, element->parent);
basepath = element->parent->path;
-
- if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_UNKNOWN)
- element->subtype = element->parent->subtype;
} else {
element->parent = element_root->data;
g_node_append_data(node, element);
if (element->type == CONNMAN_ELEMENT_TYPE_CONNECTION) {
- if (g_dbus_register_interface(connection, element->path,
- CONNMAN_CONNECTION_INTERFACE,
- connection_methods, element_signals,
- NULL, element, NULL) == FALSE)
- connman_error("Failed to register %s connection",
- element->path);
- else {
- set_signal_strength(element);
- emit_connections_signal(connection);
- emit_state_change(connection, "online");
- }
+ emit_connections_signal(connection);
+ emit_state_change(connection, "online");
}
emit_element_signal(connection, "ElementAdded", element);
}
}
+ if (element->type == CONNMAN_ELEMENT_TYPE_DHCP)
+ element->ipv4.method = CONNMAN_IPV4_METHOD_DHCP;
+
element->parent = parent;
__connman_element_unlock(element);
g_node_unlink(node);
if (element->driver) {
- disable_element(element);
-
if (element->driver->remove)
element->driver->remove(element);
CONNMAN_ELEMENT_TYPE_CONNECTION) == 0)
emit_state_change(connection, "offline");
emit_connections_signal(connection);
-
- g_dbus_unregister_interface(connection, element->path,
- CONNMAN_CONNECTION_INTERFACE);
}
emit_element_signal(connection, "ElementRemoved", element);
static gboolean update_element(GNode *node, gpointer user_data)
{
struct connman_element *element = node->data;
- struct connman_element *root = user_data;
DBG("element %p name %s", element, element->name);
if (element->driver && element->driver->update)
element->driver->update(element);
- if (element->type == CONNMAN_ELEMENT_TYPE_CONNECTION &&
- root->type == CONNMAN_ELEMENT_TYPE_NETWORK) {
- if (element->strength != root->strength) {
- element->strength = root->strength;
- emit_property_changed(connection, element, "Strength",
- DBUS_TYPE_BYTE, &element->strength);
- }
- }
-
emit_element_signal(connection, "ElementUpdated", element);
return FALSE;
element->enabled = enabled;
- emit_enabled_signal(connection, element);
-
return 0;
}
started = TRUE;
+ __connman_storage_init_device();
+
__connman_connection_init();
+ __connman_ipv4_init();
__connman_detect_init();
}
DBG("");
__connman_detect_cleanup();
+ __connman_ipv4_cleanup();
__connman_connection_cleanup();
}
DBG("element %p name %s", element, element->name);
if (element->driver) {
- disable_element(element);
-
if (element->driver->remove)
element->driver->remove(element);
projects / connman / blobdiff