Release 0.7

[connman] / include / element.h

diff --git a/include/element.h b/include/element.h
index 1334a03..d91886b 100644 (file)
--- a/include/element.h
+++ b/include/element.h
@@ -30,6 +30,7 @@ extern "C" {
 #include <glib.h>
 
 #include <connman/property.h>
+#include <connman/ipv4.h>
 
 /**
  * SECTION:element
@@ -37,20 +38,6 @@ extern "C" {
  * @short_description: Functions for handling elements
  */
 
-enum connman_element_state {
-       CONNMAN_ELEMENT_STATE_UNKNOWN   = 0,
-       CONNMAN_ELEMENT_STATE_CONNECT   = 1,
-       CONNMAN_ELEMENT_STATE_CONNECTED = 2,
-       CONNMAN_ELEMENT_STATE_CLOSED    = 3,
-};
-
-enum connman_element_policy {
-       CONNMAN_ELEMENT_POLICY_UNKNOWN = 0,
-       CONNMAN_ELEMENT_POLICY_IGNORE  = 1,
-       CONNMAN_ELEMENT_POLICY_AUTO    = 2,
-       CONNMAN_ELEMENT_POLICY_ASK     = 3,
-};
-
 enum connman_element_type {
        CONNMAN_ELEMENT_TYPE_UNKNOWN    = 0,
        CONNMAN_ELEMENT_TYPE_ROOT       = 1,
@@ -68,16 +55,6 @@ enum connman_element_type {
        CONNMAN_ELEMENT_TYPE_VENDOR     = 10000,
 };
 
-enum connman_element_subtype {
-       CONNMAN_ELEMENT_SUBTYPE_UNKNOWN   = 0,
-       CONNMAN_ELEMENT_SUBTYPE_FAKE      = 1,
-       CONNMAN_ELEMENT_SUBTYPE_ETHERNET  = 3,
-       CONNMAN_ELEMENT_SUBTYPE_WIFI      = 4,
-       CONNMAN_ELEMENT_SUBTYPE_WIMAX     = 5,
-       CONNMAN_ELEMENT_SUBTYPE_CELLULAR  = 6,
-       CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH = 7,
-};
-
 struct connman_driver;
 
 struct connman_element {
@@ -86,15 +63,7 @@ struct connman_element {
        gchar *name;
        gchar *path;
        enum connman_element_type type;
-       enum connman_element_subtype subtype;
-       enum connman_element_state state;
-       enum connman_element_policy policy;
        gboolean enabled;
-       gboolean available;
-       gboolean remember;
-       guint16 priority;
-       guint8 strength;
-       gchar *devpath;
        gchar *devname;
 
        struct connman_element *parent;
@@ -113,6 +82,7 @@ struct connman_element {
        GSList *properties;
 
        struct {
+               enum connman_ipv4_method method;
                gchar *address;
                gchar *netmask;
                gchar *gateway;
@@ -120,11 +90,6 @@ struct connman_element {
                gchar *broadcast;
                gchar *nameserver;
        } ipv4;
-
-       struct {
-               gchar *security;
-               gchar *passphrase;
-       } wifi;
 };
 
 extern struct connman_element *connman_element_create(const char *name);
@@ -159,8 +124,6 @@ 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_scanning(struct connman_element *element,
-                                                       gboolean scanning);
 
 static inline void *connman_element_get_data(struct connman_element *element)
 {