From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 24 Nov 2008 15:38:39 +0000 (+0100)
Subject: Add policy setting and export it
X-Git-Tag: 0.1~64
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aeea2a47158da318eeb017d8ae028d5c23024647;p=platform%2Fupstream%2Fconnman.git

Add policy setting and export it
---

diff --git a/include/element.h b/include/element.h
index 55f9593..1607f82 100644
--- a/include/element.h
+++ b/include/element.h
@@ -44,6 +44,14 @@ enum connman_element_state {
 	CONNMAN_ELEMENT_STATE_CLOSED    = 3,
 };
 
+enum connman_element_policy {
+	CONNMAN_ELEMENT_POLICY_UNKNOWN = 0,
+	CONNMAN_ELEMENT_POLICY_OFF     = 1,
+	CONNMAN_ELEMENT_POLICY_AUTO    = 2,
+	CONNMAN_ELEMENT_POLICY_IGNORE  = 3,
+	CONNMAN_ELEMENT_POLICY_ASK     = 4,
+};
+
 enum connman_element_type {
 	CONNMAN_ELEMENT_TYPE_UNKNOWN    = 0,
 	CONNMAN_ELEMENT_TYPE_ROOT       = 1,
@@ -82,6 +90,7 @@ struct connman_element {
 	enum connman_element_type type;
 	enum connman_element_subtype subtype;
 	enum connman_element_state state;
+	enum connman_element_policy policy;
 	gboolean enabled;
 	guint16 priority;
 
diff --git a/src/element.c b/src/element.c
index 0f28b8c..eb9c07f 100644
--- a/src/element.c
+++ b/src/element.c
@@ -146,6 +146,24 @@ static const char *subtype2string(enum connman_element_subtype type)
 	return NULL;
 }
 
+static const char *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_ASK:
+		return "ask";
+	}
+
+	return NULL;
+}
+
 static void append_property(DBusMessageIter *dict,
 				struct connman_property *property)
 {
@@ -301,6 +319,11 @@ static DBusMessage *get_device_properties(DBusConnection *conn,
 		connman_dbus_dict_append_variant(&dict, "Type",
 						DBUS_TYPE_STRING, &str);
 
+	str = policy2string(element->policy);
+	if (str != NULL)
+		connman_dbus_dict_append_variant(&dict, "Policy",
+						DBUS_TYPE_STRING, &str);
+
 	connman_dbus_dict_append_variant(&dict, "Powered",
 					DBUS_TYPE_BOOLEAN, &element->enabled);
 
@@ -319,6 +342,7 @@ static DBusMessage *get_network_properties(DBusConnection *conn,
 	struct connman_element *element = data;
 	DBusMessage *reply;
 	DBusMessageIter array, dict;
+	const char *str;
 
 	DBG("conn %p", conn);
 
@@ -333,6 +357,11 @@ static DBusMessage *get_network_properties(DBusConnection *conn,
 			DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
 			DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
 
+	str = policy2string(element->policy);
+	if (str != NULL)
+		connman_dbus_dict_append_variant(&dict, "Policy",
+						DBUS_TYPE_STRING, &str);
+
 	connman_dbus_dict_append_variant(&dict, "Connected",
 					DBUS_TYPE_BOOLEAN, &element->enabled);
 
@@ -796,6 +825,7 @@ struct connman_element *connman_element_create(const char *name)
 	element->type    = CONNMAN_ELEMENT_TYPE_UNKNOWN;
 	element->subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN;
 	element->state   = CONNMAN_ELEMENT_STATE_CLOSED;
+	element->policy  = CONNMAN_ELEMENT_POLICY_AUTO;
 	element->index   = -1;
 	element->enabled = FALSE;