Add more property helpers

[connman] / include / element.h

diff --git a/include/element.h b/include/element.h
index af34da8..d2f13ab 100644 (file)
--- a/include/element.h
+++ b/include/element.h
@@ -31,6 +31,12 @@ extern "C" {
 
 #include <connman/property.h>
 
+/**
+ * SECTION:element
+ * @title: Element premitives
+ * @short_description: Functions for handling elements
+ */
+
 enum connman_element_state {
        CONNMAN_ELEMENT_STATE_UNKNOWN   = 0,
        CONNMAN_ELEMENT_STATE_CONNECT   = 1,
@@ -41,36 +47,42 @@ enum connman_element_state {
 enum connman_element_type {
        CONNMAN_ELEMENT_TYPE_UNKNOWN    = 0,
        CONNMAN_ELEMENT_TYPE_ROOT       = 1,
-       CONNMAN_ELEMENT_TYPE_DEVICE     = 2,
-       CONNMAN_ELEMENT_TYPE_NETWORK    = 3,
-       CONNMAN_ELEMENT_TYPE_IPV4       = 4,
-       CONNMAN_ELEMENT_TYPE_IPV6       = 5,
-       CONNMAN_ELEMENT_TYPE_DHCP       = 6,
-       CONNMAN_ELEMENT_TYPE_BOOTP      = 7,
-       CONNMAN_ELEMENT_TYPE_ZEROCONF   = 8,
-       CONNMAN_ELEMENT_TYPE_RESOLVER   = 9,
-
-       CONNMAN_ELEMENT_TYPE_CONNECTION = 42,
+       CONNMAN_ELEMENT_TYPE_PROFILE    = 2,
+       CONNMAN_ELEMENT_TYPE_DEVICE     = 3,
+       CONNMAN_ELEMENT_TYPE_NETWORK    = 4,
+       CONNMAN_ELEMENT_TYPE_IPV4       = 5,
+       CONNMAN_ELEMENT_TYPE_IPV6       = 6,
+       CONNMAN_ELEMENT_TYPE_DHCP       = 7,
+       CONNMAN_ELEMENT_TYPE_BOOTP      = 8,
+       CONNMAN_ELEMENT_TYPE_ZEROCONF   = 9,
+       CONNMAN_ELEMENT_TYPE_RESOLVER   = 10,
+
+       CONNMAN_ELEMENT_TYPE_INTERNET   = 42,
 };
 
 enum connman_element_subtype {
        CONNMAN_ELEMENT_SUBTYPE_UNKNOWN   = 0,
-       CONNMAN_ELEMENT_SUBTYPE_ETHERNET  = 1,
-       CONNMAN_ELEMENT_SUBTYPE_WIFI      = 2,
-       CONNMAN_ELEMENT_SUBTYPE_WIMAX     = 3,
-       CONNMAN_ELEMENT_SUBTYPE_MODEM     = 4,
-       CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH = 5,
+       CONNMAN_ELEMENT_SUBTYPE_FAKE      = 1,
+       CONNMAN_ELEMENT_SUBTYPE_NETWORK   = 2,
+       CONNMAN_ELEMENT_SUBTYPE_ETHERNET  = 3,
+       CONNMAN_ELEMENT_SUBTYPE_WIFI      = 4,
+       CONNMAN_ELEMENT_SUBTYPE_WIMAX     = 5,
+       CONNMAN_ELEMENT_SUBTYPE_MODEM     = 6,
+       CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH = 7,
 };
 
 struct connman_driver;
 
 struct connman_element {
        gint refcount;
+       GStaticMutex mutex;
+       gint index;
        gchar *name;
        gchar *path;
        enum connman_element_type type;
        enum connman_element_subtype subtype;
        enum connman_element_state state;
+       gboolean enabled;
        guint16 priority;
 
        struct connman_element *parent;
@@ -81,10 +93,8 @@ struct connman_element {
        GSList *properties;
 
        struct {
-               int index;
-               short flags;
-               gchar *name;
-       } netdev;
+               gchar *identifier;
+       } network;
 
        struct {
                gchar *address;
@@ -96,22 +106,43 @@ struct connman_element {
        } ipv4;
 };
 
-extern struct connman_element *connman_element_create(void);
+#define connman_element_lock(element)    g_static_mutex_lock(&(element)->mutex)
+#define connman_element_unlock(element)  g_static_mutex_unlock(&(element)->mutex)
+
+extern struct connman_element *connman_element_create(const char *name);
 extern struct connman_element *connman_element_ref(struct connman_element *element);
 extern void connman_element_unref(struct connman_element *element);
 
 extern int connman_element_add_static_property(struct connman_element *element,
                                const char *name, int type, const void *value);
+extern int connman_element_add_static_array_property(struct connman_element *element,
+                       const char *name, int type, const void *value, int len);
+extern int connman_element_define_properties(struct connman_element *element, ...);
+extern int connman_element_create_property(struct connman_element *element,
+                                               const char *name, int type);
 extern int connman_element_set_property(struct connman_element *element,
-                       enum connman_property_type type, const void *value);
+                               enum connman_property_id id, const void *value);
 extern int connman_element_get_value(struct connman_element *element,
-                               enum connman_property_type type, void *value);
+                               enum connman_property_id id, void *value);
+extern gboolean connman_element_get_static_property(struct connman_element *element,
+                                               const char *name, void *value);
+extern gboolean connman_element_get_static_array_property(struct connman_element *element,
+                                       const char *name, void *value, int *len);
+extern gboolean connman_element_match_static_property(struct connman_element *element,
+                                       const char *name, const void *value);
 
 extern int connman_element_register(struct connman_element *element,
                                        struct connman_element *parent);
 extern void connman_element_unregister(struct connman_element *element);
+extern void connman_element_unregister_children(struct connman_element *element);
 extern void connman_element_update(struct connman_element *element);
 
+extern int connman_element_set_enabled(struct connman_element *element,
+                                                       gboolean enabled);
+
+extern int connman_element_set_enabled(struct connman_element *element,
+                                                       gboolean enabled);
+
 static inline void *connman_element_get_data(struct connman_element *element)
 {
        return element->driver_data;