DBUS_TYPE_STRING, "IPv4.Netmask" },
{ CONNMAN_PROPERTY_ID_IPV4_GATEWAY,
DBUS_TYPE_STRING, "IPv4.Gateway" },
+ { CONNMAN_PROPERTY_ID_IPV4_BROADCAST,
+ DBUS_TYPE_STRING, "IPv4.Broadcast" },
{ CONNMAN_PROPERTY_ID_IPV4_NAMESERVER,
DBUS_TYPE_STRING, "IPv4.Nameserver" },
return "bootp";
case CONNMAN_ELEMENT_TYPE_ZEROCONF:
return "zeroconf";
- case CONNMAN_ELEMENT_TYPE_RESOLVER:
- return "resolver";
case CONNMAN_ELEMENT_TYPE_CONNECTION:
return "connection";
}
return NULL;
}
+static const char *subtype2description(enum connman_element_subtype type)
+{
+ switch (type) {
+ case CONNMAN_ELEMENT_SUBTYPE_UNKNOWN:
+ case CONNMAN_ELEMENT_SUBTYPE_FAKE:
+ case CONNMAN_ELEMENT_SUBTYPE_NETWORK:
+ return NULL;
+ case CONNMAN_ELEMENT_SUBTYPE_ETHERNET:
+ return "Ethernet";
+ case CONNMAN_ELEMENT_SUBTYPE_WIFI:
+ return "Wireless";
+ case CONNMAN_ELEMENT_SUBTYPE_WIMAX:
+ return "WiMAX";
+ case CONNMAN_ELEMENT_SUBTYPE_MODEM:
+ return "Modem";
+ 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_OFF:
- return "off";
- case CONNMAN_ELEMENT_POLICY_AUTO:
- return "auto";
case CONNMAN_ELEMENT_POLICY_IGNORE:
return "ignore";
+ case CONNMAN_ELEMENT_POLICY_AUTO:
+ return "auto";
case CONNMAN_ELEMENT_POLICY_ASK:
return "ask";
}
enum connman_element_policy __connman_element_string2policy(const char *policy)
{
- if (strcasecmp(policy, "off") == 0)
- return CONNMAN_ELEMENT_POLICY_OFF;
- else if (strcasecmp(policy, "ignore") == 0)
+ if (strcasecmp(policy, "ignore") == 0)
return CONNMAN_ELEMENT_POLICY_IGNORE;
else if (strcasecmp(policy, "auto") == 0)
return CONNMAN_ELEMENT_POLICY_AUTO;
iface = CONNMAN_NETWORK_INTERFACE;
key = "Connected";
break;
+ case CONNMAN_ELEMENT_TYPE_CONNECTION:
+ iface = CONNMAN_CONNECTION_INTERFACE;
+ key = "Default";
+ break;
default:
return;
}
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 void emit_scanning_signal(DBusConnection *conn,
+ struct connman_element *element)
+{
+ DBusMessage *signal;
+ DBusMessageIter entry, value;
+ const char *key = "Scanning";
+
+ DBG("conn %p", conn);
+
+ if (element == NULL)
+ return;
+
+ if (element->type != CONNMAN_ELEMENT_TYPE_DEVICE)
+ return;
+
+ signal = dbus_message_new_signal(element->path,
+ CONNMAN_DEVICE_INTERFACE, "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->scanning);
dbus_message_iter_close_container(&entry, &value);
g_dbus_send_message(conn, signal);
emit_enabled_signal(connection, element);
-#if 0
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-#endif
-
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
emit_enabled_signal(connection, element);
-#if 0
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-#endif
-
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
DBusMessageIter value, iter;
const char *key = "Networks";
- if (element->subtype != CONNMAN_ELEMENT_SUBTYPE_WIFI &&
- element->subtype != CONNMAN_ELEMENT_SUBTYPE_WIMAX)
- return;
-
dbus_message_iter_append_basic(entry, DBUS_TYPE_STRING, &key);
dbus_message_iter_open_container(entry, DBUS_TYPE_VARIANT,
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+ str = subtype2description(element->subtype);
+ if (str != NULL && element->devname != NULL) {
+ char *name = g_strdup_printf("%s (%s)", str, element->devname);
+ if (name != NULL)
+ connman_dbus_dict_append_variant(&dict, "Name",
+ DBUS_TYPE_STRING, &name);
+ g_free(name);
+ }
+
str = subtype2string(element->subtype);
if (str != NULL)
connman_dbus_dict_append_variant(&dict, "Type",
connman_dbus_dict_append_variant(&dict, "Powered",
DBUS_TYPE_BOOLEAN, &element->enabled);
- dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY,
- NULL, &entry);
-
- append_networks(element, &dict);
+ if (element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIFI ||
+ element->subtype == CONNMAN_ELEMENT_SUBTYPE_WIMAX ||
+ element->subtype == CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH) {
+ connman_dbus_dict_append_variant(&dict, "Scanning",
+ DBUS_TYPE_BOOLEAN, &element->scanning);
- dbus_message_iter_close_container(&dict, &entry);
+ dbus_message_iter_open_container(&dict, DBUS_TYPE_DICT_ENTRY,
+ NULL, &entry);
+ append_networks(element, &entry);
+ dbus_message_iter_close_container(&dict, &entry);
+ }
add_common_properties(element, &dict);
dbus_message_iter_get_basic(&value, &powered);
if (powered == TRUE)
- do_enable(conn, msg, data);
+ do_enable(conn, msg, element);
else
- do_disable(conn, msg, data);
+ do_disable(conn, msg, element);
} else
set_common_property(element, name, &value);
DBG("conn %p", conn);
+ if (element->subtype != CONNMAN_ELEMENT_SUBTYPE_WIFI)
+ return __connman_error_invalid_arguments(msg);
+
if (dbus_message_iter_init(msg, &iter) == FALSE)
return __connman_error_invalid_arguments(msg);
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+ if (element->parent)
+ connman_dbus_dict_append_variant(&dict, "Device",
+ DBUS_TYPE_OBJECT_PATH, &element->parent->path);
+
str = __connman_element_policy2string(element->policy);
if (str != NULL)
connman_dbus_dict_append_variant(&dict, "Policy",
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static DBusMessage *get_connection_properties(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
- DBusMessage *reply;
- DBusMessageIter array, dict;
-
- 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);
-
- add_common_properties(element, &dict);
-
- dbus_message_iter_close_container(&array, &dict);
-
- return reply;
-}
-
-#if 0
-static DBusMessage *get_properties(DBusConnection *conn,
+static DBusMessage *connection_get_properties(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_element *element = data;
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
- if (element->parent != NULL &&
- element->parent->type != CONNMAN_ELEMENT_TYPE_ROOT) {
- connman_dbus_dict_append_variant(&dict, "Parent",
- DBUS_TYPE_OBJECT_PATH, &element->parent->path);
- }
-
- str = type2string(element->type);
- if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Type",
- DBUS_TYPE_STRING, &str);
str = subtype2string(element->subtype);
if (str != NULL)
- connman_dbus_dict_append_variant(&dict, "Subtype",
+ connman_dbus_dict_append_variant(&dict, "Type",
DBUS_TYPE_STRING, &str);
- connman_dbus_dict_append_variant(&dict, "Enabled",
+ 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);
return reply;
}
-static DBusMessage *set_property(DBusConnection *conn,
+static DBusMessage *connection_set_property(DBusConnection *conn,
DBusMessage *msg, void *data)
{
struct connman_element *element = data;
- DBusMessageIter iter;
- DBusMessageIter value;
+ DBusMessageIter iter, value;
const char *name;
DBG("conn %p", conn);
if (__connman_security_check_privileges(msg) < 0)
return __connman_error_permission_denied(msg);
- set_common_property(element, name, &value);
-
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
-}
-
-static DBusMessage *clear_property(DBusConnection *conn,
- DBusMessage *msg, void *data)
-{
- struct connman_element *element = data;
- const char *name;
- GSList *list;
-
- DBG("conn %p", conn);
-
- if (dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &name,
- DBUS_TYPE_INVALID) == FALSE)
- return __connman_error_invalid_arguments(msg);
+ if (g_str_equal(name, "Default") == TRUE) {
+ dbus_bool_t enabled;
- if (__connman_security_check_privileges(msg) < 0)
- return __connman_error_permission_denied(msg);
-
- __connman_element_lock(element);
+ dbus_message_iter_get_basic(&value, &enabled);
- for (list = element->properties; list; list = list->next) {
- struct connman_property *property = list->data;
-
- if (g_str_equal(property->name, name) == FALSE)
- continue;
-
- if (property->flags & CONNMAN_PROPERTY_FLAG_STATIC)
- continue;
-
- if (property->flags & CONNMAN_PROPERTY_FLAG_REFERENCE)
- continue;
-
- property->flags |= CONNMAN_PROPERTY_FLAG_REFERENCE;
-
- if (property->type == DBUS_TYPE_STRING)
- g_free(property->value);
-
- property->value = NULL;
+ if (enabled == TRUE)
+ return do_enable(conn, msg, element);
+ else
+ return do_disable(conn, msg, element);
}
- __connman_element_unlock(element);
-
return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
}
-static GDBusMethodTable element_methods[] = {
- { "GetProperties", "", "a{sv}", get_properties },
- { "SetProperty", "sv", "", set_property },
- { "ClearProperty", "s", "", clear_property },
- { "Update", "", "", do_update },
- { "Enable", "", "", do_enable },
- { "Disable", "", "", do_disable },
- { },
-};
-#endif
-
-static GDBusSignalTable element_signals[] = {
- { "PropertyChanged", "sv" },
- { },
-};
-
static GDBusMethodTable device_methods[] = {
{ "GetProperties", "", "a{sv}", device_get_properties },
{ "SetProperty", "sv", "", device_set_property },
};
static GDBusMethodTable connection_methods[] = {
- { "GetProperties", "", "a{sv}", get_connection_properties },
+ { "GetProperties", "", "a{sv}", connection_get_properties },
+ { "SetProperty", "sv", "", connection_set_property },
+ { },
+};
+
+static GDBusSignalTable element_signals[] = {
+ { "PropertyChanged", "sv" },
{ },
};
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_DEVICE:
+ iface = CONNMAN_DEVICE_INTERFACE;
+ break;
+ case CONNMAN_ELEMENT_TYPE_NETWORK:
+ iface = CONNMAN_NETWORK_INTERFACE;
+ break;
+ 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)
+{
+ GSList *list;
+
+ DBG("element %p name %s", element, element->name);
+
+ if (type != DBUS_TYPE_STRING && type != DBUS_TYPE_BYTE)
+ return -EINVAL;
+
+ __connman_element_lock(element);
+
+ for (list = element->properties; list; list = list->next) {
+ struct connman_property *property = list->data;
+
+ if (g_str_equal(property->name, name) == FALSE)
+ continue;
+
+ if (!(property->flags & CONNMAN_PROPERTY_FLAG_STATIC))
+ continue;
+
+ property->type = type;
+ g_free(property->value);
+
+ switch (type) {
+ case DBUS_TYPE_STRING:
+ property->value = g_strdup(*((const char **) value));
+ break;
+ case DBUS_TYPE_BYTE:
+ property->value = g_try_malloc(1);
+ if (property->value != NULL)
+ memcpy(property->value, value, 1);
+ break;
+ }
+ }
+
+ __connman_element_unlock(element);
+
+ emit_property_changed(connection, element, name, type, value);
+
+ return 0;
+}
+
int connman_element_add_static_array_property(struct connman_element *element,
const char *name, int type, const void *value, int len)
{
element->ipv4.gateway = g_strdup(*((const char **) value));
__connman_element_unlock(element);
break;
+ case CONNMAN_PROPERTY_ID_IPV4_BROADCAST:
+ __connman_element_lock(element);
+ g_free(element->ipv4.broadcast);
+ element->ipv4.broadcast = g_strdup(*((const char **) value));
+ __connman_element_unlock(element);
+ break;
case CONNMAN_PROPERTY_ID_IPV4_NAMESERVER:
__connman_element_lock(element);
g_free(element->ipv4.nameserver);
return -EINVAL;
}
-#if 0
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-#endif
-
return 0;
}
*((char **) value) = element->ipv4.gateway;
__connman_element_unlock(element);
break;
+ case CONNMAN_PROPERTY_ID_IPV4_BROADCAST:
+ if (element->ipv4.broadcast == NULL)
+ return connman_element_get_value(element->parent,
+ id, value);
+ __connman_element_lock(element);
+ *((char **) value) = element->ipv4.broadcast;
+ __connman_element_unlock(element);
+ break;
case CONNMAN_PROPERTY_ID_IPV4_NAMESERVER:
if (element->ipv4.nameserver == NULL)
return connman_element_get_value(element->parent,
dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-
__connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_DEVICE, &iter);
-
dbus_message_iter_close_container(&value, &iter);
dbus_message_iter_close_container(entry, &value);
dbus_message_iter_open_container(&value, DBUS_TYPE_ARRAY,
DBUS_TYPE_OBJECT_PATH_AS_STRING, &iter);
-
__connman_element_list(NULL, CONNMAN_ELEMENT_TYPE_CONNECTION, &iter);
-
dbus_message_iter_close_container(&value, &iter);
dbus_message_iter_close_container(entry, &value);
dbus_message_iter_open_container(entry, DBUS_TYPE_VARIANT,
DBUS_TYPE_STRING_AS_STRING, &value);
-
dbus_message_iter_append_basic(&value, DBUS_TYPE_STRING, &state);
-
dbus_message_iter_close_container(entry, &value);
}
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 register_element(gpointer data, gpointer user_data)
{
struct connman_element *element = data;
g_node_append_data(node, element);
-#if 0
- if (g_dbus_register_interface(connection, element->path,
- CONNMAN_ELEMENT_INTERFACE,
- element_methods, element_signals,
- NULL, element, NULL) == FALSE)
- connman_error("Failed to register %s element", element->path);
-#endif
-
if (element->type == CONNMAN_ELEMENT_TYPE_DEVICE &&
element->subtype != CONNMAN_ELEMENT_SUBTYPE_NETWORK) {
if (g_dbus_register_interface(connection, element->path,
connman_error("Failed to register %s connection",
element->path);
else {
+ set_signal_strength(element);
emit_connections_signal(connection);
emit_state_change(connection, "online");
}
}
-#if 0
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementAdded",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-#endif
-
__connman_element_store(element);
for (list = driver_list; list; list = list->next) {
if (element->devname == NULL)
element->devname = g_strdup(element->name);
- if (device_filter && element->type == CONNMAN_ELEMENT_TYPE_DEVICE) {
+ if (device_filter && element->type == CONNMAN_ELEMENT_TYPE_DEVICE &&
+ element->subtype != CONNMAN_ELEMENT_SUBTYPE_NETWORK) {
if (g_pattern_match_simple(device_filter,
element->devname) == FALSE) {
DBG("ignoring %s [%s] device", element->name,
g_node_destroy(node);
}
-#if 0
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementRemoved",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-#endif
-
if (element->type == CONNMAN_ELEMENT_TYPE_CONNECTION) {
- emit_state_change(connection, "offline");
+ if (__connman_element_count(NULL,
+ CONNMAN_ELEMENT_TYPE_CONNECTION) == 0)
+ emit_state_change(connection, "offline");
emit_connections_signal(connection);
g_dbus_unregister_interface(connection, element->path,
CONNMAN_DEVICE_INTERFACE);
}
-#if 0
- g_dbus_unregister_interface(connection, element->path,
- CONNMAN_ELEMENT_INTERFACE);
-#endif
-
connman_element_unref(element);
return FALSE;
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 0
- g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
- CONNMAN_MANAGER_INTERFACE, "ElementUpdated",
- DBUS_TYPE_OBJECT_PATH, &element->path,
- DBUS_TYPE_INVALID);
-#endif
+ 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);
+ }
+ }
return FALSE;
}
if (node != NULL)
g_node_traverse(node, G_PRE_ORDER,
- G_TRAVERSE_ALL, -1, update_element, NULL);
+ G_TRAVERSE_ALL, -1, update_element, element);
}
int connman_element_set_enabled(struct connman_element *element,
element->enabled = enabled;
- connman_element_update(element);
+ emit_enabled_signal(connection, element);
+
+ return 0;
+}
+
+int connman_element_set_scanning(struct connman_element *element,
+ gboolean scanning)
+{
+ if (element->scanning == scanning)
+ return 0;
+
+ element->scanning = scanning;
+
+ emit_scanning_signal(connection, element);
return 0;
}
projects / connman / blobdiff