return NULL;
}
-const char *__connman_ipv4_method2string(enum connman_ipv4_method method)
-{
- switch (method) {
- case CONNMAN_IPV4_METHOD_UNKNOWN:
- return "unknown";
- case CONNMAN_IPV4_METHOD_OFF:
- return "off";
- case CONNMAN_IPV4_METHOD_STATIC:
- return "static";
- case CONNMAN_IPV4_METHOD_DHCP:
- return "dhcp";
- }
-
- return "unknown";
-}
-
-enum connman_ipv4_method __connman_ipv4_string2method(const char *method)
-{
- if (strcasecmp(method, "off") == 0)
- return CONNMAN_IPV4_METHOD_OFF;
- else if (strcasecmp(method, "static") == 0)
- return CONNMAN_IPV4_METHOD_STATIC;
- else if (strcasecmp(method, "dhcp") == 0)
- return CONNMAN_IPV4_METHOD_DHCP;
- else
- return CONNMAN_IPV4_METHOD_UNKNOWN;
-}
-
static void emit_element_signal(DBusConnection *conn, const char *member,
struct connman_element *element)
{
return data.count;
}
-const char *__connman_element_get_device(struct connman_element *element)
+static struct connman_network *__connman_element_get_network(struct connman_element *element)
+{
+ if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK &&
+ element->network != NULL)
+ return element->network;
+
+ if (element->parent == NULL)
+ return NULL;
+
+ return __connman_element_get_network(element->parent);
+}
+
+struct connman_service *__connman_element_get_service(struct connman_element *element)
+{
+ struct connman_service *service = NULL;
+ struct connman_network *network;
+ struct connman_device *device;
+ enum connman_device_type type;
+
+ device = __connman_element_get_device(element);
+ if (device == NULL)
+ return NULL;
+
+ type = connman_device_get_type(device);
+
+ switch (type) {
+ case CONNMAN_DEVICE_TYPE_UNKNOWN:
+ case CONNMAN_DEVICE_TYPE_VENDOR:
+ case CONNMAN_DEVICE_TYPE_BLUETOOTH:
+ case CONNMAN_DEVICE_TYPE_GPS:
+ case CONNMAN_DEVICE_TYPE_MBM:
+ case CONNMAN_DEVICE_TYPE_HSO:
+ case CONNMAN_DEVICE_TYPE_NOZOMI:
+ case CONNMAN_DEVICE_TYPE_HUAWEI:
+ case CONNMAN_DEVICE_TYPE_NOVATEL:
+ break;
+ case CONNMAN_DEVICE_TYPE_ETHERNET:
+ service = __connman_service_lookup_from_device(device);
+ break;
+ case CONNMAN_DEVICE_TYPE_WIFI:
+ case CONNMAN_DEVICE_TYPE_WIMAX:
+ network = __connman_element_get_network(element);
+ if (network == NULL)
+ return NULL;
+ service = __connman_service_lookup_from_network(network);
+ break;
+ }
+
+ return service;
+}
+
+struct connman_device *__connman_element_get_device(struct connman_element *element)
{
if (element->type == CONNMAN_ELEMENT_TYPE_DEVICE &&
element->device != NULL)
- return element->path;
+ return element->device;
if (element->parent == NULL)
return NULL;
return __connman_element_get_device(element->parent);
}
-const char *__connman_element_get_network(struct connman_element *element)
+const char *__connman_element_get_device_path(struct connman_element *element)
+{
+ struct connman_device *device;
+
+ device = __connman_element_get_device(element);
+ if (device == NULL)
+ return NULL;
+
+ return connman_device_get_path(device);
+}
+
+const char *__connman_element_get_network_path(struct connman_element *element)
{
if (element->type == CONNMAN_ELEMENT_TYPE_NETWORK &&
element->network != NULL)
if (element->parent == NULL)
return NULL;
- return __connman_element_get_network(element->parent);
+ return __connman_element_get_network_path(element->parent);
}
static gint compare_priority(gconstpointer a, gconstpointer b)
element->name = NULL;
element->type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
+ element->state = CONNMAN_ELEMENT_STATE_UNKNOWN;
+ element->error = CONNMAN_ELEMENT_ERROR_UNKNOWN;
element->index = -1;
element->enabled = FALSE;
}
}
-int connman_element_set_static_property(struct connman_element *element,
+static int set_static_property(struct connman_element *element,
const char *name, int type, const void *value)
{
struct connman_property *property;
return 0;
}
-int connman_element_set_static_array_property(struct connman_element *element,
+static int set_static_array_property(struct connman_element *element,
const char *name, int type, const void *value, int len)
{
struct connman_property *property;
return 0;
}
-int connman_element_set_property(struct connman_element *element,
+#if 0
+static int set_property(struct connman_element *element,
enum connman_property_id id, const void *value)
{
switch (id) {
return 0;
}
+#endif
int connman_element_get_value(struct connman_element *element,
enum connman_property_id id, void *value)
switch (id) {
case CONNMAN_PROPERTY_ID_IPV4_METHOD:
- if (element->ipv4.method == CONNMAN_IPV4_METHOD_UNKNOWN)
+ if (element->ipv4.method == CONNMAN_IPCONFIG_METHOD_UNKNOWN)
return connman_element_get_value(element->parent,
id, value);
__connman_element_lock(element);
- *((const char **) value) = __connman_ipv4_method2string(element->ipv4.method);
+ *((const char **) value) = __connman_ipconfig_method2string(element->ipv4.method);
__connman_element_unlock(element);
break;
case CONNMAN_PROPERTY_ID_IPV4_ADDRESS:
return 0;
}
-gboolean connman_element_get_static_property(struct connman_element *element,
+static gboolean get_static_property(struct connman_element *element,
const char *name, void *value)
{
struct connman_property *property;
__connman_element_unlock(element);
if (found == FALSE && element->parent != NULL)
- return connman_element_get_static_property(element->parent,
- name, value);
+ return get_static_property(element->parent, name, value);
return found;
}
-gboolean connman_element_get_static_array_property(struct connman_element *element,
- const char *name, void *value, int *len)
+static gboolean get_static_array_property(struct connman_element *element,
+ const char *name, void *value, unsigned int *len)
{
struct connman_property *property;
gboolean found = FALSE;
return found;
}
-gboolean connman_element_match_static_property(struct connman_element *element,
+#if 0
+static gboolean match_static_property(struct connman_element *element,
const char *name, const void *value)
{
struct connman_property *property;
return result;
}
+#endif
+
+/**
+ * connman_element_set_string:
+ * @element: element structure
+ * @key: unique identifier
+ * @value: string value
+ *
+ * Set string value for specific key
+ */
+int connman_element_set_string(struct connman_element *element,
+ const char *key, const char *value)
+{
+ return set_static_property(element, key, DBUS_TYPE_STRING, &value);
+}
+
+/**
+ * connman_element_get_string:
+ * @element: element structure
+ * @key: unique identifier
+ *
+ * Get string value for specific key
+ */
+const char *connman_element_get_string(struct connman_element *element,
+ const char *key)
+{
+ const char *value;
+
+ if (get_static_property(element, key, &value) == FALSE)
+ return NULL;
+
+ return value;
+}
+
+/**
+ * connman_element_set_uint8:
+ * @element: element structure
+ * @key: unique identifier
+ * @value: integer value
+ *
+ * Set integer value for specific key
+ */
+int connman_element_set_uint8(struct connman_element *element,
+ const char *key, connman_uint8_t value)
+{
+ return set_static_property(element, key, DBUS_TYPE_BYTE, &value);
+}
+
+/**
+ * connman_element_get_uint8:
+ * @element: element structure
+ * @key: unique identifier
+ *
+ * Get integer value for specific key
+ */
+connman_uint8_t connman_element_get_uint8(struct connman_element *element,
+ const char *key)
+{
+ connman_uint8_t value;
+
+ if (get_static_property(element, key, &value) == FALSE)
+ return 0;
+
+ return value;
+}
+
+/**
+ * connman_element_set_blob:
+ * @element: element structure
+ * @key: unique identifier
+ * @data: blob data
+ * @size: blob size
+ *
+ * Set binary blob value for specific key
+ */
+int connman_element_set_blob(struct connman_element *element,
+ const char *key, const void *data, unsigned int size)
+{
+ return set_static_array_property(element, key,
+ DBUS_TYPE_BYTE, &data, size);
+}
+
+/**
+ * connman_element_get_blob:
+ * @element: element structure
+ * @key: unique identifier
+ * @size: pointer to blob size
+ *
+ * Get binary blob value for specific key
+ */
+const void *connman_element_get_blob(struct connman_element *element,
+ const char *key, unsigned int *size)
+{
+ void *value;
+
+ if (get_static_array_property(element, key, &value, size) == FALSE)
+ return NULL;
+
+ return value;
+}
int __connman_element_append_ipv4(struct connman_element *element,
DBusMessageIter *dict)
{
const char *method = NULL;
const char *address = NULL, *netmask = NULL, *gateway = NULL;
+ const char *broadcast = NULL, *nameserver = NULL;
connman_element_get_value(element,
CONNMAN_PROPERTY_ID_IPV4_METHOD, &method);
CONNMAN_PROPERTY_ID_IPV4_NETMASK, &netmask);
connman_element_get_value(element,
CONNMAN_PROPERTY_ID_IPV4_GATEWAY, &gateway);
+ connman_element_get_value(element,
+ CONNMAN_PROPERTY_ID_IPV4_BROADCAST, &broadcast);
+ connman_element_get_value(element,
+ CONNMAN_PROPERTY_ID_IPV4_NAMESERVER, &nameserver);
if (method != NULL)
connman_dbus_dict_append_variant(dict, "IPv4.Method",
connman_dbus_dict_append_variant(dict, "IPv4.Gateway",
DBUS_TYPE_STRING, &gateway);
+ if (broadcast != NULL)
+ connman_dbus_dict_append_variant(dict, "IPv4.Broadcast",
+ DBUS_TYPE_STRING, &broadcast);
+
+ if (nameserver != NULL)
+ connman_dbus_dict_append_variant(dict, "IPv4.Nameserver",
+ DBUS_TYPE_STRING, &nameserver);
+
return 0;
}
type = dbus_message_iter_get_arg_type(value);
if (g_str_equal(name, "IPv4.Method") == TRUE) {
- enum connman_ipv4_method method;
+ enum connman_ipconfig_method method;
const char *str;
if (type != DBUS_TYPE_STRING)
return -EINVAL;
dbus_message_iter_get_basic(value, &str);
- method = __connman_ipv4_string2method(str);
- if (method == CONNMAN_IPV4_METHOD_UNKNOWN)
+ method = __connman_ipconfig_string2method(str);
+ if (method == CONNMAN_IPCONFIG_METHOD_UNKNOWN)
return -EINVAL;
if (method == element->ipv4.method)
element->ipv4.gateway = g_strdup(gateway);
connman_element_update(element);
+ } else if (g_str_equal(name, "IPv4.Broadcast") == TRUE) {
+ const char *broadcast;
+
+ if (type != DBUS_TYPE_STRING)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(value, &broadcast);
+
+ g_free(element->ipv4.broadcast);
+ element->ipv4.broadcast = g_strdup(broadcast);
+
+ connman_element_update(element);
+ } else if (g_str_equal(name, "IPv4.Nameserver") == TRUE) {
+ const char *nameserver;
+
+ if (type != DBUS_TYPE_STRING)
+ return -EINVAL;
+
+ dbus_message_iter_get_basic(value, &nameserver);
+
+ g_free(element->ipv4.nameserver);
+ element->ipv4.nameserver = g_strdup(nameserver);
+
+ connman_element_update(element);
}
return 0;
append_state(&entry, state);
g_dbus_send_message(conn, signal);
+
+ signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+ CONNMAN_MANAGER_INTERFACE, "StateChanged");
+ if (signal == NULL)
+ return;
+
+ dbus_message_iter_init_append(signal, &entry);
+ dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &state);
+
+ g_dbus_send_message(conn, signal);
}
static void probe_element(struct connman_element *element)
element->parent = element_root->data;
node = element_root;
- basepath = "";
+ basepath = "/device";
}
element->path = g_strdup_printf("%s/%s", basepath, element->name);
__connman_element_unlock(element);
+ if (node == NULL) {
+ connman_error("Element registration for %s failed",
+ element->path);
+ return;
+ }
+
DBG("element %p path %s", element, element->path);
g_node_append_data(node, element);
}
if (element->type == CONNMAN_ELEMENT_TYPE_DHCP)
- element->ipv4.method = CONNMAN_IPV4_METHOD_DHCP;
+ element->ipv4.method = CONNMAN_IPCONFIG_METHOD_DHCP;
element->parent = parent;
return 0;
}
+static enum connman_service_error convert_error(enum connman_element_error error)
+{
+ switch (error) {
+ case CONNMAN_ELEMENT_ERROR_UNKNOWN:
+ case CONNMAN_ELEMENT_ERROR_FAILED:
+ break;
+ case CONNMAN_ELEMENT_ERROR_DHCP_FAILED:
+ return CONNMAN_SERVICE_ERROR_DHCP_FAILED;
+ case CONNMAN_ELEMENT_ERROR_CONNECT_FAILED:
+ return CONNMAN_SERVICE_ERROR_CONNECT_FAILED;
+ }
+
+ return CONNMAN_SERVICE_ERROR_UNKNOWN;
+}
+
+/**
+ * connman_element_set_error:
+ * @element: element structure
+ * @error: error identifier
+ *
+ * Set error state and specific error identifier
+ */
+void connman_element_set_error(struct connman_element *element,
+ enum connman_element_error error)
+{
+ struct connman_service *service;
+
+ DBG("element %p error %d", element, error);
+
+ if (element->type == CONNMAN_ELEMENT_TYPE_ROOT)
+ return;
+
+ element->state = CONNMAN_ELEMENT_STATE_ERROR;
+ element->error = error;
+
+ if (element->driver && element->driver->change)
+ element->driver->change(element);
+
+ service = __connman_element_get_service(element);
+ __connman_service_indicate_error(service, convert_error(error));
+}
+
int __connman_element_init(DBusConnection *conn, const char *device,
const char *nodevice)
{
element_root = g_node_new(element);
__connman_notifier_init();
+ __connman_service_init();
__connman_network_init();
__connman_device_init();
__connman_connection_init();
__connman_ipv4_init();
- __connman_detect_init();
+ __connman_rfkill_init();
}
void __connman_element_stop(void)
{
DBG("");
- __connman_detect_cleanup();
+ __connman_rfkill_cleanup();
__connman_ipv4_cleanup();
__connman_connection_cleanup();
}
__connman_device_cleanup();
__connman_network_cleanup();
+ __connman_service_cleanup();
__connman_notifier_cleanup();
g_node_traverse(element_root, G_POST_ORDER, G_TRAVERSE_ALL, -1,
projects / platform / upstream / connman.git / blobdiff