fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 10:30:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: refactor nm_device_connection_is_available()

Browse source 
No functional change, but refactor the function to
return early.

(cherry picked from commit 364c4476e3)
This commit is contained in:
Thomas Haller 2014-12-08 12:15:02 +01:00
parent a042cec8a9
commit e7c8affef5
1 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/devices/nm-device.c
View file

@ -6826,30 +6826,44 @@ nm_device_connection_is_available (NMDevice *self,
gboolean for_user_activation_request)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
gboolean available = FALSE;
gboolean is_default_unmanaged;
if (nm_device_get_default_unmanaged (self) && (priv->state == NM_DEVICE_STATE_UNMANAGED)) {
if (g_hash_table_contains (priv->available_connections, connection))
return TRUE;
is_default_unmanaged = priv->state == NM_DEVICE_STATE_UNMANAGED && nm_device_get_default_unmanaged (self);
if (!for_user_activation_request && !is_default_unmanaged) {
/* Shortcut: there are only additional checks for either @for_user_activation_request
* or @is_default_unmanaged. Return FALSE right away. */
return FALSE;
}
if (!nm_device_check_connection_compatible (self, connection)) {
/* An incompatilbe connection is never available. */
return FALSE;
}
if ( is_default_unmanaged
&& NM_DEVICE_GET_CLASS (self)->check_connection_available (self, connection, NULL)) {
/* default-unmanaged devices in UNMANAGED state have no available connections
* so we must manually check whether the connection is available here.
*/
if ( nm_device_check_connection_compatible (self, connection)
&& NM_DEVICE_GET_CLASS (self)->check_connection_available (self, connection, NULL))
return TRUE;
* so we must manually check whether the connection is available here. */
return TRUE;
}
available = !!g_hash_table_lookup (priv->available_connections, connection);
if (!available && for_user_activation_request) {
/* FIXME: hack for hidden WiFi becuase clients didn't consistently
* set the 'hidden' property to indicate hidden SSID networks. If
* activating but the network isn't available let the device recheck
* availability.
if ( for_user_activation_request
&& NM_DEVICE_GET_CLASS (self)->check_connection_available_wifi_hidden
&& NM_DEVICE_GET_CLASS (self)->check_connection_available_wifi_hidden (self, connection)) {
/* Connections for an explicit user activation request might only be available after
* additional checking.
*
* For example in case of hidden Wi-Fi, the connection might not have the 'hidden' property
* set. Support this by allowing device specific overrides.
*/
if ( nm_device_check_connection_compatible (self, connection)
&& NM_DEVICE_GET_CLASS (self)->check_connection_available_wifi_hidden)
available = NM_DEVICE_GET_CLASS (self)->check_connection_available_wifi_hidden (self, connection);
return TRUE;
}
return available;
return FALSE;
}
static void