Treat connection timeout the same as failures

[connman] / src / device.c

diff --git a/src/device.c b/src/device.c
index b0210b0..0af3ccd 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -35,6 +35,7 @@ struct connman_device {
        enum connman_device_type type;
        enum connman_device_mode mode;
        enum connman_device_policy policy;
+       connman_bool_t secondary;
        connman_bool_t powered;
        connman_bool_t carrier;
        connman_bool_t scanning;
@@ -45,6 +46,7 @@ struct connman_device {
        char *node;
        char *address;
        char *interface;
+       char *ident;
        unsigned int connections;
        guint scan_timeout;
 
@@ -170,6 +172,18 @@ static int set_carrier(struct connman_device *device, connman_bool_t carrier)
                enum connman_element_type type = CONNMAN_ELEMENT_TYPE_UNKNOWN;
                struct connman_element *element;
 
+               device->disconnected = TRUE;
+
+               switch (device->policy) {
+               case CONNMAN_DEVICE_POLICY_UNKNOWN:
+               case CONNMAN_DEVICE_POLICY_IGNORE:
+               case CONNMAN_DEVICE_POLICY_OFF:
+               case CONNMAN_DEVICE_POLICY_MANUAL:
+                       return 0;
+               case CONNMAN_DEVICE_POLICY_AUTO:
+                       break;
+               }
+
                switch (device->element.ipv4.method) {
                case CONNMAN_IPV4_METHOD_UNKNOWN:
                case CONNMAN_IPV4_METHOD_OFF:
@@ -191,7 +205,10 @@ static int set_carrier(struct connman_device *device, connman_bool_t carrier)
                                                        &device->element) < 0)
                                connman_element_unref(element);
 
-                       __connman_service_indicate_configuration(service);
+                       device->disconnected = FALSE;
+
+                       __connman_service_indicate_state(service,
+                                       CONNMAN_SERVICE_STATE_CONFIGURATION);
                }
        } else
                connman_element_unregister_children(&device->element);
@@ -436,7 +453,7 @@ static DBusMessage *set_property(DBusConnection *conn,
 
                err = set_powered(device, powered);
                if (err < 0 && err != -EINPROGRESS)
-                       return __connman_error_failed(msg);
+                       return __connman_error_failed(msg, -err);
        } else if (g_str_equal(name, "Policy") == TRUE) {
                enum connman_device_policy policy;
                const char *str;
@@ -452,7 +469,7 @@ static DBusMessage *set_property(DBusConnection *conn,
 
                err = set_policy(conn, device, policy);
                if (err < 0)
-                       return __connman_error_failed(msg);
+                       return __connman_error_failed(msg, -err);
        } else if (g_str_equal(name, "Priority") == TRUE) {
                connman_uint8_t priority;
 
@@ -540,7 +557,7 @@ static DBusMessage *join_network(DBusConnection *conn,
 
        network = connman_network_create("00_00_00_00_00_00", type);
        if (network == NULL)
-               return __connman_error_failed(msg);
+               return __connman_error_failed(msg, ENOMEM);
 
        while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_DICT_ENTRY) {
                DBusMessageIter entry, value;
@@ -576,7 +593,7 @@ static DBusMessage *join_network(DBusConnection *conn,
        connman_network_unref(network);
 
        if (err < 0)
-               return __connman_error_failed(msg);
+               return __connman_error_failed(msg, -err);
 
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
@@ -626,11 +643,11 @@ static DBusMessage *propose_scan(DBusConnection *conn,
                return __connman_error_not_supported(msg);
 
        if (device->powered == FALSE)
-               return __connman_error_failed(msg);
+               return __connman_error_failed(msg, EINVAL);
 
        err = device->driver->scan(device);
        if (err < 0)
-               return __connman_error_failed(msg);
+               return __connman_error_failed(msg, -err);
 
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
@@ -778,7 +795,8 @@ static int setup_device(struct connman_device *device)
        case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
                break;
        case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
-               __connman_profile_add_device(device);
+               if (device->secondary == FALSE)
+                       __connman_profile_add_device(device);
                break;
        }
 
@@ -822,7 +840,8 @@ static void remove_device(struct connman_device *device)
        case CONNMAN_DEVICE_MODE_NETWORK_MULTIPLE:
                break;
        case CONNMAN_DEVICE_MODE_TRANSPORT_IP:
-               __connman_profile_remove_device(device);
+               if (device->secondary == FALSE)
+                       __connman_profile_remove_device(device);
                break;
        }
 
@@ -919,6 +938,7 @@ static void device_destruct(struct connman_element *element)
 
        DBG("element %p name %s", element, element->name);
 
+       g_free(device->ident);
        g_free(device->node);
        g_free(device->name);
        g_free(device->address);
@@ -968,10 +988,11 @@ struct connman_device *connman_device_create(const char *node,
 
        device->element.ipv4.method = CONNMAN_IPV4_METHOD_DHCP;
 
-       device->type   = type;
-       device->name   = g_strdup(type2description(device->type));
-       device->mode   = CONNMAN_DEVICE_MODE_UNKNOWN;
-       device->policy = CONNMAN_DEVICE_POLICY_AUTO;
+       device->type      = type;
+       device->name      = g_strdup(type2description(device->type));
+       device->mode      = CONNMAN_DEVICE_MODE_UNKNOWN;
+       device->policy    = CONNMAN_DEVICE_POLICY_AUTO;
+       device->secondary = FALSE;
 
        switch (type) {
        case CONNMAN_DEVICE_TYPE_UNKNOWN:
@@ -1133,6 +1154,25 @@ const char *connman_device_get_interface(struct connman_device *device)
 }
 
 /**
+ * connman_device_set_ident:
+ * @device: device structure
+ * @ident: unique identifier
+ *
+ * Set unique identifier of device
+ */
+void connman_device_set_ident(struct connman_device *device,
+                                                       const char *ident)
+{
+       g_free(device->ident);
+       device->ident = g_strdup(ident);
+}
+
+const char *__connman_device_get_ident(struct connman_device *device)
+{
+       return device->ident;
+}
+
+/**
  * connman_device_set_policy:
  * @device: device structure
  * @policy: power and connection policy
@@ -1170,6 +1210,30 @@ enum connman_device_mode connman_device_get_mode(struct connman_device *device)
 }
 
 /**
+ * connman_device_set_secondary:
+ * @device: device structure
+ * @secondary: secondary value
+ *
+ * Change secondary value of device
+ */
+void connman_device_set_secondary(struct connman_device *device,
+                                                connman_bool_t secondary)
+{
+       device->secondary = secondary;
+}
+
+/**
+ * connman_device_get_secondary:
+ * @device: device structure
+ *
+ * Get secondary value of device
+ */
+connman_bool_t connman_device_get_secondary(struct connman_device *device)
+{
+       return device->secondary;
+}
+
+/**
  * connman_device_set_powered:
  * @device: device structure
  * @powered: powered state
@@ -1258,19 +1322,6 @@ int connman_device_set_carrier(struct connman_device *device,
 
        device->carrier = carrier;
 
-       if (carrier == TRUE)
-               device->disconnected = FALSE;
-
-       switch (device->policy) {
-       case CONNMAN_DEVICE_POLICY_UNKNOWN:
-       case CONNMAN_DEVICE_POLICY_IGNORE:
-       case CONNMAN_DEVICE_POLICY_OFF:
-               return 0;
-       case CONNMAN_DEVICE_POLICY_AUTO:
-       case CONNMAN_DEVICE_POLICY_MANUAL:
-               break;
-       }
-
        return set_carrier(device, device->carrier);
 }