mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-28 23:50:10 +01:00
8e9f782082
A GObject interface, like a class, has two different C types associated with it; the type of the "class" struct (eg, GObjectClass, GFileIface), and the type of instances of that class/interface (eg, GObject, GFile). NetworkManager was doing this wrong though, and using the same C type to point to both the interface's class struct and to instances of the interface. This ends up not actually breaking anything, since for interface types, the instance type is a non-dereferenceable dummy type anyway. But it's wrong, since if, eg, NMDeviceFactory is a struct type containing members "start", "device_added", etc, then you should not be using an NMDeviceFactory* to point to an object that does not contain those members. Fix this by splitting NMDeviceFactory into NMDeviceFactoryInterface and NMDeviceFactory; by splitting NMConnectionProvider into NMConnectionProviderInterface and NMConnectionProvider; and by splitting NMSettingsPlugin into NMSettingsPluginInterface and NMSettingsPlugin; and then use the right types in the right places. As a bonus, this also lets us now use G_DEFINE_INTERFACE.
129 lines
4.7 KiB
C
129 lines
4.7 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details:
|
|
*
|
|
* Copyright (C) 2012 Red Hat, Inc.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include "nm-connection-provider.h"
|
|
#include "nm-utils.h"
|
|
|
|
G_DEFINE_INTERFACE (NMConnectionProvider, nm_connection_provider, G_TYPE_OBJECT)
|
|
|
|
GSList *
|
|
nm_connection_provider_get_best_connections (NMConnectionProvider *self,
|
|
guint max_requested,
|
|
const char *ctype1,
|
|
const char *ctype2,
|
|
NMConnectionFilterFunc func,
|
|
gpointer func_data)
|
|
{
|
|
g_return_val_if_fail (NM_IS_CONNECTION_PROVIDER (self), NULL);
|
|
|
|
if (NM_CONNECTION_PROVIDER_GET_INTERFACE (self)->get_best_connections)
|
|
return NM_CONNECTION_PROVIDER_GET_INTERFACE (self)->get_best_connections (self, max_requested, ctype1, ctype2, func, func_data);
|
|
return NULL;
|
|
}
|
|
|
|
const GSList *
|
|
nm_connection_provider_get_connections (NMConnectionProvider *self)
|
|
{
|
|
g_return_val_if_fail (NM_IS_CONNECTION_PROVIDER (self), NULL);
|
|
|
|
if (NM_CONNECTION_PROVIDER_GET_INTERFACE (self)->get_connections)
|
|
return NM_CONNECTION_PROVIDER_GET_INTERFACE (self)->get_connections (self);
|
|
return NULL;
|
|
}
|
|
|
|
/**
|
|
* nm_connection_provider_add_connection:
|
|
* @self: the #NMConnectionProvider
|
|
* @connection: the source connection to create a new #NMSettingsConnection from
|
|
* @save_to_disk: %TRUE to save the connection to disk immediately, %FALSE to
|
|
* not save to disk
|
|
* @error: on return, a location to store any errors that may occur
|
|
*
|
|
* Creates a new #NMSettingsConnection for the given source @connection.
|
|
* The plugin owns the returned object and the caller must reference the object
|
|
* to continue using it.
|
|
*
|
|
* Returns: the new #NMSettingsConnection or %NULL
|
|
*/
|
|
NMConnection *
|
|
nm_connection_provider_add_connection (NMConnectionProvider *self,
|
|
NMConnection *connection,
|
|
gboolean save_to_disk,
|
|
GError **error)
|
|
{
|
|
g_return_val_if_fail (NM_IS_CONNECTION_PROVIDER (self), NULL);
|
|
|
|
g_assert (NM_CONNECTION_PROVIDER_GET_INTERFACE (self)->add_connection);
|
|
return NM_CONNECTION_PROVIDER_GET_INTERFACE (self)->add_connection (self, connection, save_to_disk, error);
|
|
}
|
|
|
|
/**
|
|
* nm_connection_provider_get_connection_by_uuid:
|
|
* @self: the #NMConnectionProvider
|
|
* @uuid: the UUID to search for
|
|
*
|
|
* Returns: the connection with the given @uuid, or %NULL
|
|
*/
|
|
NMConnection *
|
|
nm_connection_provider_get_connection_by_uuid (NMConnectionProvider *self,
|
|
const char *uuid)
|
|
{
|
|
g_return_val_if_fail (NM_IS_CONNECTION_PROVIDER (self), NULL);
|
|
g_return_val_if_fail (uuid != NULL, NULL);
|
|
g_return_val_if_fail (nm_utils_is_uuid (uuid), NULL);
|
|
|
|
g_assert (NM_CONNECTION_PROVIDER_GET_INTERFACE (self)->get_connection_by_uuid);
|
|
return NM_CONNECTION_PROVIDER_GET_INTERFACE (self)->get_connection_by_uuid (self, uuid);
|
|
}
|
|
|
|
/*****************************************************************************/
|
|
|
|
static void
|
|
nm_connection_provider_default_init (NMConnectionProviderInterface *g_iface)
|
|
{
|
|
GType iface_type = G_TYPE_FROM_INTERFACE (g_iface);
|
|
static gboolean initialized = FALSE;
|
|
|
|
if (initialized)
|
|
return;
|
|
initialized = TRUE;
|
|
|
|
/* Signals */
|
|
g_signal_new (NM_CP_SIGNAL_CONNECTION_ADDED,
|
|
iface_type,
|
|
G_SIGNAL_RUN_FIRST,
|
|
G_STRUCT_OFFSET (NMConnectionProviderInterface, connection_added),
|
|
NULL, NULL,
|
|
g_cclosure_marshal_VOID__OBJECT,
|
|
G_TYPE_NONE, 1, G_TYPE_OBJECT);
|
|
|
|
g_signal_new (NM_CP_SIGNAL_CONNECTION_UPDATED,
|
|
iface_type,
|
|
G_SIGNAL_RUN_FIRST,
|
|
G_STRUCT_OFFSET (NMConnectionProviderInterface, connection_updated),
|
|
NULL, NULL,
|
|
g_cclosure_marshal_VOID__OBJECT,
|
|
G_TYPE_NONE, 1, G_TYPE_OBJECT);
|
|
|
|
g_signal_new (NM_CP_SIGNAL_CONNECTION_REMOVED,
|
|
iface_type,
|
|
G_SIGNAL_RUN_FIRST,
|
|
G_STRUCT_OFFSET (NMConnectionProviderInterface, connection_removed),
|
|
NULL, NULL,
|
|
g_cclosure_marshal_VOID__OBJECT,
|
|
G_TYPE_NONE, 1, G_TYPE_OBJECT);
|
|
}
|