*
* Connection Manager
*
- * Copyright (C) 2007-2008 Intel Corporation. All rights reserved.
+ * Copyright (C) 2007-2009 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include <glib.h>
#include <connman/property.h>
+#include <connman/types.h>
+#include <connman/ipconfig.h>
/**
* SECTION:element
* @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_type {
CONNMAN_ELEMENT_TYPE_UNKNOWN = 0,
CONNMAN_ELEMENT_TYPE_ROOT = 1,
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,
+ CONNMAN_ELEMENT_TYPE_SERVICE = 5,
+ CONNMAN_ELEMENT_TYPE_PPP = 6,
+ CONNMAN_ELEMENT_TYPE_IPV4 = 7,
+ CONNMAN_ELEMENT_TYPE_IPV6 = 8,
+ CONNMAN_ELEMENT_TYPE_DHCP = 9,
+ CONNMAN_ELEMENT_TYPE_BOOTP = 10,
+ CONNMAN_ELEMENT_TYPE_ZEROCONF = 11,
+ CONNMAN_ELEMENT_TYPE_CONNECTION = 42,
+ CONNMAN_ELEMENT_TYPE_VENDOR = 10000,
+};
+
+enum connman_element_state {
+ CONNMAN_ELEMENT_STATE_UNKNOWN = 0,
+ CONNMAN_ELEMENT_STATE_ERROR = 1,
+ CONNMAN_ELEMENT_STATE_IDLE = 2,
+ CONNMAN_ELEMENT_STATE_DONE = 3,
};
-enum connman_element_subtype {
- CONNMAN_ELEMENT_SUBTYPE_UNKNOWN = 0,
- 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,
+enum connman_element_error {
+ CONNMAN_ELEMENT_ERROR_UNKNOWN = 0,
+ CONNMAN_ELEMENT_ERROR_FAILED = 1,
+ CONNMAN_ELEMENT_ERROR_DHCP_FAILED = 2,
+ CONNMAN_ELEMENT_ERROR_CONNECT_FAILED = 3,
};
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;
+ enum connman_element_error error;
gboolean enabled;
- guint16 priority;
+ gboolean configuring;
+ gchar *devname;
struct connman_element *parent;
struct connman_driver *driver;
void *driver_data;
- GSList *properties;
+ void (*destruct) (struct connman_element *element);
- struct {
- gchar *identifier;
- } network;
+ union {
+ void *private;
+ struct connman_device *device;
+ struct connman_network *network;
+ };
+
+ GHashTable *properties;
struct {
+ enum connman_ipconfig_method method;
gchar *address;
gchar *netmask;
gchar *gateway;
} ipv4;
};
-#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_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_id id, const void *value);
-extern int connman_element_get_value(struct connman_element *element,
+struct connman_element *connman_element_create(const char *name);
+struct connman_element *connman_element_ref(struct connman_element *element);
+void connman_element_unref(struct connman_element *element);
+
+int connman_element_get_value(struct connman_element *element,
enum connman_property_id id, void *value);
-extern int connman_element_register(struct connman_element *element,
+int connman_element_set_string(struct connman_element *element,
+ const char *key, const char *value);
+const char *connman_element_get_string(struct connman_element *element,
+ const char *key);
+int connman_element_set_uint8(struct connman_element *element,
+ const char *key, connman_uint8_t value);
+connman_uint8_t connman_element_get_uint8(struct connman_element *element,
+ const char *key);
+int connman_element_set_blob(struct connman_element *element,
+ const char *key, const void *data, unsigned int size);
+const void *connman_element_get_blob(struct connman_element *element,
+ const char *key, unsigned int *size);
+
+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);
+void connman_element_unregister(struct connman_element *element);
+void connman_element_unregister_children(struct connman_element *element);
+void connman_element_update(struct connman_element *element);
-extern int connman_element_set_enabled(struct connman_element *element,
+int connman_element_set_enabled(struct connman_element *element,
gboolean enabled);
+void connman_element_set_error(struct connman_element *element,
+ enum connman_element_error error);
static inline void *connman_element_get_data(struct connman_element *element)
{