Set correct subtype for transition period

[connman] / src / device.c

diff --git a/src/device.c b/src/device.c
index d74b634..590b955 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -72,8 +72,6 @@ static const char *type2string(enum connman_device_type type)
                return "wifi";
        case CONNMAN_DEVICE_TYPE_WIMAX:
                return "wimax";
-       case CONNMAN_DEVICE_TYPE_MODEM:
-               return "modem";
        case CONNMAN_DEVICE_TYPE_BLUETOOTH:
                return "bluetooth";
        case CONNMAN_DEVICE_TYPE_HSO:
@@ -99,6 +97,20 @@ static const char *policy2string(enum connman_device_policy policy)
        }
 }
 
+static enum connman_device_policy string2policy(const char *policy)
+{
+       if (g_str_equal(policy, "ignore") == TRUE)
+               return CONNMAN_DEVICE_POLICY_IGNORE;
+       else if (g_str_equal(policy, "off") == TRUE)
+               return CONNMAN_DEVICE_POLICY_OFF;
+       else if (g_str_equal(policy, "auto") == TRUE)
+               return CONNMAN_DEVICE_POLICY_AUTO;
+       else if (g_str_equal(policy, "manual") == TRUE)
+               return CONNMAN_DEVICE_POLICY_MANUAL;
+       else
+               return CONNMAN_DEVICE_POLICY_UNKNOWN;
+}
+
 static int set_powered(struct connman_device *device, gboolean powered)
 {
        struct connman_device_driver *driver = device->driver;
@@ -124,6 +136,60 @@ static int set_powered(struct connman_device *device, gboolean powered)
        return err;
 }
 
+static int set_policy(DBusConnection *connection,
+                               struct connman_device *device,
+                                       enum connman_device_policy policy)
+{
+       DBusMessage *signal;
+       DBusMessageIter entry, value;
+       const char *str, *key = "Policy";
+       int err = 0;
+
+       DBG("device %p policy %d", device, policy);
+
+       if (device->policy == policy)
+               return 0;
+
+       switch (policy) {
+       case CONNMAN_DEVICE_POLICY_OFF:
+               if (device->powered == TRUE)
+                       err = set_powered(device, FALSE);
+               break;
+       case CONNMAN_DEVICE_POLICY_AUTO:
+       case CONNMAN_DEVICE_POLICY_MANUAL:
+               if (device->powered == FALSE)
+                       err = set_powered(device, TRUE);
+               break;
+       default:
+               break;
+       }
+
+       if (err < 0)
+               return err;
+
+       device->policy = policy;
+
+       signal = dbus_message_new_signal(device->element.path,
+                               CONNMAN_DEVICE_INTERFACE, "PropertyChanged");
+       if (signal == NULL)
+               return 0;
+
+       dbus_message_iter_init_append(signal, &entry);
+
+       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+
+       str = policy2string(policy);
+
+       dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
+                                       DBUS_TYPE_STRING_AS_STRING, &value);
+       dbus_message_iter_append_basic(&value, DBUS_TYPE_STRING, &str);
+       dbus_message_iter_close_container(&entry, &value);
+
+       g_dbus_send_message(connection, signal);
+
+       return 0;
+}
+
 static void append_networks(struct connman_device *device,
                                                DBusMessageIter *entry)
 {
@@ -239,6 +305,19 @@ static DBusMessage *set_property(DBusConnection *conn,
                err = set_powered(device, powered);
                if (err < 0 && err != -EINPROGRESS)
                        return __connman_error_failed(msg);
+       } else if (g_str_equal(name, "Policy") == TRUE) {
+               enum connman_device_policy policy;
+               const char *str;
+               int err;
+
+               dbus_message_iter_get_basic(&value, &str);
+               policy = string2policy(str);
+               if (policy == CONNMAN_DEVICE_POLICY_UNKNOWN)
+                       return __connman_error_invalid_arguments(msg);
+
+               err = set_policy(conn, device, policy);
+               if (err < 0)
+                       return __connman_error_failed(msg);
        }
 
        __connman_element_store(&device->element);
@@ -459,6 +538,15 @@ struct connman_device *connman_device_create(const char *node,
        device->element.type = CONNMAN_ELEMENT_TYPE_DEVICE;
        device->element.index = -1;
 
+       switch (type) {
+       case CONNMAN_DEVICE_TYPE_ETHERNET:
+               device->element.subtype = CONNMAN_ELEMENT_SUBTYPE_ETHERNET;
+               break;
+       default:
+               device->element.subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN;
+               break;
+       }
+
        device->element.device = device;
        device->element.destruct = device_destruct;
 
@@ -833,7 +921,8 @@ static void device_enable(struct connman_device *device)
 {
        DBG("device %p", device);
 
-       if (device->policy != CONNMAN_DEVICE_POLICY_AUTO)
+       if (device->policy == CONNMAN_DEVICE_POLICY_IGNORE ||
+                               device->policy == CONNMAN_DEVICE_POLICY_OFF)
                return;
 
        if (device->powered == TRUE)
@@ -847,7 +936,7 @@ static void device_disable(struct connman_device *device)
 {
        DBG("device %p", device);
 
-       if (device->policy != CONNMAN_DEVICE_POLICY_AUTO)
+       if (device->policy == CONNMAN_DEVICE_POLICY_IGNORE)
                return;
 
        if (device->powered == FALSE)