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

core: move nm_device_interface_check_connection_compatible() to nm-device.c

Browse source
This commit is contained in:
Dan Williams 2011-11-17 23:04:47 -06:00
parent 777d9cb182
commit 4f330838bd
6 changed files with 25 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/nm-device-interface.c
View file

@ -288,21 +288,6 @@ nm_device_interface_get_iface (NMDeviceInterface *device)
return iface;
}
gboolean
nm_device_interface_check_connection_compatible (NMDeviceInterface *device,
NMConnection *connection,
GError **error)
{
g_return_val_if_fail (NM_IS_DEVICE_INTERFACE (device), FALSE);
g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
g_return_val_if_fail (error != NULL, FALSE);
g_return_val_if_fail (*error == NULL, FALSE);
if (NM_DEVICE_INTERFACE_GET_INTERFACE (device)->check_connection_compatible)
return NM_DEVICE_INTERFACE_GET_INTERFACE (device)->check_connection_compatible (device, connection, error);
return TRUE;
}
gboolean
nm_device_interface_activate (NMDeviceInterface *device,
NMActRequest *req,

8
src/nm-device-interface.h
View file

@ -93,10 +93,6 @@ struct _NMDeviceInterface {
GTypeInterface g_iface;
/* Methods */
gboolean (*check_connection_compatible) (NMDeviceInterface *device,
NMConnection *connection,
GError **error);
gboolean (*activate) (NMDeviceInterface *device,
NMActRequest *req,
GError **error);
@ -128,10 +124,6 @@ gboolean nm_device_interface_disconnect (NMDeviceInterface *device, GError **err
GType nm_device_interface_get_type (void);
gboolean nm_device_interface_check_connection_compatible (NMDeviceInterface *device,
NMConnection *connection,
GError **error);
gboolean nm_device_interface_activate (NMDeviceInterface *device,
NMActRequest *req,
GError **error);

34
src/nm-device.c
View file

@ -168,9 +168,6 @@ typedef struct {
NMDevice * master;
} NMDevicePrivate;
static gboolean check_connection_compatible (NMDeviceInterface *device,
NMConnection *connection,
GError **error);
static gboolean nm_device_activate (NMDeviceInterface *device,
NMActRequest *req,
GError **error);
@ -205,7 +202,6 @@ static void
device_interface_init (NMDeviceInterface *device_interface_class)
{
/* interface implementation */
device_interface_class->check_connection_compatible = check_connection_compatible;
device_interface_class->activate = nm_device_activate;
device_interface_class->deactivate = nm_device_deactivate;
device_interface_class->disconnect = device_disconnect;
@ -656,6 +652,23 @@ nm_device_complete_connection (NMDevice *self,
return success;
}
gboolean
nm_device_check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error)
{
g_return_val_if_fail (device != NULL, FALSE);
g_return_val_if_fail (NM_IS_DEVICE (device), FALSE);
g_return_val_if_fail (connection != NULL, FALSE);
g_return_val_if_fail (NM_IS_CONNECTION (connection), FALSE);
g_return_val_if_fail (error != NULL, FALSE);
g_return_val_if_fail (*error == NULL, FALSE);
if (NM_DEVICE_GET_CLASS (device)->check_connection_compatible)
return NM_DEVICE_GET_CLASS (device)->check_connection_compatible (device, connection, error);
return TRUE;
}
static void
dnsmasq_state_changed_cb (NMDnsMasqManager *manager, guint32 status, gpointer user_data)
{
@ -2956,19 +2969,6 @@ device_disconnect (NMDeviceInterface *device,
return TRUE;
}
static gboolean
check_connection_compatible (NMDeviceInterface *dev_iface,
NMConnection *connection,
GError **error)
{
NMDeviceClass *klass = NM_DEVICE_GET_CLASS (NM_DEVICE (dev_iface));
if (klass->check_connection_compatible)
return klass->check_connection_compatible (NM_DEVICE (dev_iface), connection, error);
return TRUE;
}
static gboolean
nm_device_activate (NMDeviceInterface *device,
NMActRequest *req,

5
src/nm-device.h
View file

@ -156,6 +156,11 @@ gboolean nm_device_complete_connection (NMDevice *device,
const GSList *existing_connection,
GError **error);
gboolean nm_device_check_connection_compatible (NMDevice *device,
NMConnection *connection,
GError **error);
gboolean nm_device_is_activating (NMDevice *dev);
gboolean nm_device_can_interrupt_activation (NMDevice *self);
gboolean nm_device_autoconnect_allowed (NMDevice *self);

7
src/nm-manager.c
View file

@ -1962,17 +1962,14 @@ internal_activate_device (NMManager *manager,
GError **error)
{
NMActRequest *req;
NMDeviceInterface *dev_iface;
gboolean success;
g_return_val_if_fail (NM_IS_MANAGER (manager), NULL);
g_return_val_if_fail (NM_IS_DEVICE (device), NULL);
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
dev_iface = NM_DEVICE_INTERFACE (device);
/* Ensure the requested connection is compatible with the device */
if (!nm_device_interface_check_connection_compatible (dev_iface, connection, error))
if (!nm_device_check_connection_compatible (device, connection, error))
return NULL;
/* Tear down any existing connection */
@ -1990,7 +1987,7 @@ internal_activate_device (NMManager *manager,
sender_uid,
assumed,
(gpointer) device);
success = nm_device_interface_activate (dev_iface, req, error);
success = nm_device_interface_activate (NM_DEVICE_INTERFACE (device), req, error);
g_object_unref (req);
return success ? nm_act_request_get_active_connection_path (req) : NULL;

2
src/nm-policy.c
View file

@ -913,7 +913,7 @@ reset_retries_all (NMSettings *settings, NMDevice *device)
connections = nm_settings_get_connections (settings);
for (iter = connections; iter; iter = g_slist_next (iter)) {
if (!device || nm_device_interface_check_connection_compatible (NM_DEVICE_INTERFACE (device), iter->data, &error))
if (!device || nm_device_check_connection_compatible (device, iter->data, &error))
set_connection_auto_retries (NM_CONNECTION (iter->data), RETRIES_DEFAULT);
g_clear_error (&error);
}