device: _get_available_connections() with _get_best_connection()

[NetworkManager.git] / src / devices / nm-device.c

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index f18b9c1..583218f 100644 (file)
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -9689,39 +9689,55 @@ nm_device_recheck_available_connections (NMDevice *self)
 }
 
 /**
- * nm_device_get_available_connections:
+ * nm_device_get_best_connection:
  * @self: the #NMDevice
  * @specific_object: a specific object path if any
+ * @error: reason why no connection was returned
  *
- * Returns a list of connections available to activate on the device, taking
- * into account any device-specific details given by @specific_object (like
- * WiFi access point path).
+ * Returns a connection that's most suitable for user-initiated activation
+ * of a device, optionally with a given specific object.
  *
- * Returns: caller-owned #GPtrArray of #NMConnections
+ * Returns: the #NMSettingsConnection or %NULL (setting an @error)
  */
-GPtrArray *
-nm_device_get_available_connections (NMDevice *self, const char *specific_object)
+NMSettingsConnection *
+nm_device_get_best_connection (NMDevice *self,
+                               const char *specific_object,
+                               GError **error)
 {
        NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
+       NMSettingsConnection *connection = NULL;
+       NMSettingsConnection *candidate;
+       guint64 best_timestamp = 0;
        GHashTableIter iter;
-       guint num_available;
-       NMConnection *connection = NULL;
-       GPtrArray *array = NULL;
 
-       num_available = g_hash_table_size (priv->available_connections);
-       if (num_available > 0) {
-               array = g_ptr_array_sized_new (num_available);
-               g_hash_table_iter_init (&iter, priv->available_connections);
-               while (g_hash_table_iter_next (&iter, (gpointer) &connection, NULL)) {
-                       /* If a specific object is given, only include connections that are
-                        * compatible with it.
-                        */
-                       if (   !specific_object /* << Optimization: we know that the connection is available without @specific_object.  */
-                           || nm_device_check_connection_available (self, connection, _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST, specific_object))
-                               g_ptr_array_add (array, connection);
+       g_hash_table_iter_init (&iter, priv->available_connections);
+       while (g_hash_table_iter_next (&iter, (gpointer) &candidate, NULL)) {
+               guint64 candidate_timestamp = 0;
+
+               /* If a specific object is given, only include connections that are
+                * compatible with it.
+                */
+               if (    specific_object /* << Optimization: we know that the connection is available without @specific_object.  */
+                   && !nm_device_check_connection_available (self,
+                                                             NM_CONNECTION (candidate),
+                                                             _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST,
+                                                             specific_object))
+                       continue;
+
+               nm_settings_connection_get_timestamp (candidate, &candidate_timestamp);
+               if (!connection || (candidate_timestamp > best_timestamp)) {
+                       connection = candidate;
+                       best_timestamp = candidate_timestamp;
                }
        }
-       return array;
+
+       if (!connection) {
+               g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_CONNECTION,
+                            "The device '%s' has no connections available for activation.",
+                             nm_device_get_iface (self));
+       }
+
+       return connection;
 }
 
 static void